Merge branch 'master' into Dev-latest

This commit is contained in:
MikeTheWatchGuy 2019-05-15 09:02:10 -04:00 committed by GitHub
commit a37911616f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 13512 additions and 2 deletions

View file

@ -48,7 +48,7 @@ def long_function_wrapper(work_id, gui_queue):
# at this point, the thread exits
return
############################# Begin GUI code #############################
def the_gui():
gui_queue = queue.Queue() # queue used to communicate between the gui and long-running code