From 49d20256fbcbd61976210c7a1c6162c5569416e8 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 27 Sep 2015 02:45:03 +0300 Subject: [PATCH] Update Pastebin.lua --- Applications/Pastebin/Pastebin.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Applications/Pastebin/Pastebin.lua b/Applications/Pastebin/Pastebin.lua index a43bdebe..759338fa 100644 --- a/Applications/Pastebin/Pastebin.lua +++ b/Applications/Pastebin/Pastebin.lua @@ -318,7 +318,7 @@ end local function inputPassword() --local massiv = ecs.input("auto", "auto", 20, "Войти в Pastebin", {"input", "Логин", ""}, {"input", "Пароль", ""}) - local data = ecs.universalWindow("auto", "auto", 30, tabColor1, true, {"EmptyLine"}, {"CenterText", 0xffffff, "Авторизация"}, {"EmptyLine"}, {"Input", 0xffffff, tabColor2, "Логин"}, {"Input", 0xffffff, tabColor2, "Пароль", "●"}, {"EmptyLine"}, {"Button", {tabColor2, 0xffffff, "Войти в аккаунт"}, {0x006dbf, 0xffffff, "Отмена"}}) + local data = ecs.universalWindow("auto", "auto", 24, tabColor1, true, {"EmptyLine"}, {"CenterText", 0xffffff, "Авторизация"}, {"EmptyLine"}, {"Input", 0xffffff, tabColor2, "Логин"}, {"Input", 0xffffff, tabColor2, "Пароль", "●"}, {"EmptyLine"}, {"Button", {tabColor2, 0xffffff, "Войти в аккаунт"}, {0x006dbf, 0xffffff, "Отмена"}}) if data[3] == "Отмена" then return false end @@ -572,7 +572,10 @@ while true do if key == "Разлогиниться" then fs.remove("System/Pastebin/Login.cfg") drawAll() - waitForSuccessLogin() + if not waitForSuccessLogin() then + ecs.prepareToExit() + return true + end drawTopBar() ecs.info("auto", "auto", " ", "Получаю список файлов...") getFileListFromPastebin(pasteLoadLimit)