bug fix

peppelg · May 2, 2019 · e758bb8 · e758bb8
1 parent d4ce8b8
commit e758bb8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/TDeskMulti.py b/TDeskMulti.py
@@ -48,11 +48,13 @@ def download_tdesk():
     global dir
     global icon
     layout = [  [sg.InputCombo(['Telegram Desktop', 'Telegram Desktop Alpha'], readonly=True)],
-                [sg.OK()]                                                     ]
+                [sg.OK()]                                                                    ]
     window = sg.Window('Telegram Desktop version', icon=icon).Layout(layout)
     event, number = window.Read()
     version = number[0]
     window.Close()
+    if version == None:
+        return 'exit'
     if version == 'Telegram Desktop':
         if os.name == 'nt':
             link = 'https://telegram.org/dl/desktop/win_portable'
@@ -114,7 +116,8 @@ def resource_path(relative_path):
     icon = b'R0lGODlhIAAgAOfFAB6WyB6WyR+XyR+XyiCYyiCYyyGYyyGZyyGZzCKZzCKazCKazSOazSObzSObziSbzimayyScziSczyWczyWdzyWd0Cad0Cae0Cae0See0Sef0Sef0iif0iig0iig0ymg0zOezimh0ymh1Cqh1Cqi1Tmezzaf0Cui1Tmfzzmf0Cuj1iyj1jqg0Syk1zih0i2k1y2k2DSj1Duh0i2l2C6l2C6l2S6m2S+m2S+m2i+n2jCn2jCn202gzDCo20ei0DGo2zGo3DGp3DKp3DKp3TKq3TOq3TOq3lOizTSr3jSr30im1TSs3zWs4DWt4Dat4Teu4mGo0U6u3Waq01uu2mir0V+x3XGu1G2x2XWv1XOw1nWx1Ha23XS75Iq52YS/4ou+34u+4I6+3ZO93ITB5pbB35LC4pnB3pzB3ZPF5Z/H4qjI3azL36PN6qzL46zM5K3M5LDM4K3N5a3N5rHN4K3O56/O5a7R6rfR4rLS6bjR5rjV6r7U57bX7cja6sXb68rb68vc68Xe8Mje7szd7Mze7Mze7czf7szf787f7s/f7c/g783i8c/j8tTj79bk8NLm9Njm8dnm8dbn89jq9t3p8+Ds9eHs9eLt9uDu+OXu9eHv+eXv9+bw+Obx+ejx+Orx+Ofy+ery+Onz+enz+uvz+Ov0+uv1++31++32++72++72/O73/O/3/PD3/PH3/PD4/PH4/PL4/fL5/fP5/fT5/fT6/fX6/fb6/fj6/Pb7/ff7/fj7/vj8/vn8/vr8/vr9/vv9/vz+/v3+//7+//7//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////yH5BAEKAP8ALAAAAAAgACAAAAj+AP8JHEhQ4JODCA8WXMhwIBMnCSMibNjQSJIlTJo4gSgxIUWCQ4gYsZiEyUOOHZ98/LcDCJAhQ0YmKXkypcqGN3Do2PEDiJAhRYwguZhxY0eGMGjUsIEjx44eQIKElEnTaMSCKla0eDGDho0bTqG+jEnSpNWJA0mcyLq161edPH0CFUpUI8eBH0SMUMv2RdKlTZ9GDcllzEyzEAVy6PAhhF6+Wrl6BbsjCptJrDRRNSsQg4YNHDzk3bs2clcvgUyxWv3oZ9ChS/5RqGABQwbQoh+vnWIH02pRlVbzgSpVpMUHESZQsHAhg4bFH2KUWbRqtSpKjlKtRhPWJcwiDBr+IJcw+wKGK3o6rV7NKVGk9a+qvN3ZUwgCBQsaOIhgIo2k9audAkkflLDSyiuwgOKXUkyFRcABByigQANhoAIgK5cM0oclrcASyyy0MNKXW2AJQAABBhyQgAI+kCHIKKU00scfm8Aiyyy12JILHpC1pRQAAQgwAAEFHHDfAiDk0QcgntyYYy679PKFXmBs0RcMAGQJgAAmPhihGH0Q4oott+gSpS+/KMHYIXSQltU/WmbJ5YkGQNHHHHeQwksvvwATTCiebWCIHKORIFCcWgY55B5wqKGFH8AIMwwxitCGgSFxhJbXoYjGKcAZa1ABoRm4FFPMG6amauonHQzUaZxTPBzRpQFSZFJMFiWgkAIidbAggwsEvdqpogRAYMWRDRTiBnkVFCTsq3N6qQAhbYjH0LPQztoFFgpQhO2rxBaw0rfCCrASp+TGeW6w6a7bkLDnBgQAOw=='
 
 if not os.path.exists(telegram):
-    download_tdesk()
+    if download_tdesk() == 'exit':
+        sys.exit(0)
 layout = [  [sg.Button(strings['new_account']), sg.Button(strings['update_tdesk'])],
             [sg.Listbox(values=list(accounts.keys()), size=(40, 10), bind_return_key=True, key='selected_account'), sg.Column([[sg.Button(strings['start'])], [sg.Button(strings['edit_name'])], [sg.Button(strings['delete_account'])]])]  ]
 window = sg.Window('TDeskMulti', icon=icon).Layout(layout)

diff --git a/executables/TDeskMulti b/executables/TDeskMulti
diff --git a/executables/TDeskMulti.exe b/executables/TDeskMulti.exe
diff --git a/executables/TDeskMulti_setup.exe b/executables/TDeskMulti_setup.exe
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
-PySimpleGUI==3.21.0
-requests==2.20.1
-python-archive==0.2
+requests==2.21.0
+python_archive==0.2
+PySimpleGUI==3.29.0
+archive==0.3