WIN_CLOSED bulk update. No more test for event is None, use WIN_CLOSED instead

This commit is contained in:
PySimpleGUI 2020-05-07 06:22:59 -04:00
parent 6174b355a6
commit 0076b461f5
135 changed files with 395 additions and 349 deletions

View file

@ -54,7 +54,7 @@ reddit = praw.Reddit(**reddit_praw_parameters)
while True: # Event Loop
event, values = window.read()
if event in (None, 'Exit'):
if event in (sg.WIN_CLOSED, 'Exit'):
break
subs_to_read = values['-SUBS-']
search_string = values['-SEARCH STRING-']
@ -94,14 +94,14 @@ while True: # Event Loop
non_blocking=True)
window.refresh()
event, values = window.read(timeout=0)
if event in (None, 'Exit'):
if event in (sg.WIN_CLOSED, 'Exit'):
break
if event in (None, 'Exit'):
if event in (sg.WIN_CLOSED, 'Exit'):
window['-OUT SUB-'].update('*** Aborted ***')
break
else:
window['-OUT SUB-'].update('*** Done! ***')
if event is None:
if event == sg.WIN_CLOSED:
break
window.close()