From a49f9dde326e4386330d7e7bb6e7fdb46c7a3e46 Mon Sep 17 00:00:00 2001
From: magical <magical@tilde.town>
Date: Mon, 5 Feb 2024 19:28:00 -0800
Subject: [PATCH] fix the GUI

i was a little hasty with the first attempt. this one has been tested
and actually works
---
 GUI.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/GUI.py b/GUI.py
index 08a41ba..df06c1a 100644
--- a/GUI.py
+++ b/GUI.py
@@ -40,7 +40,7 @@ def fileHash(fileName):
         return hash & 0xFFFFFFFF
 
 def rando_thread(window = None, values = None):
-    global failedgen, randoerror, generating, fileName, basegame, failedgen, randoerror, generating, finishGenerating
+    global fileName, basegame, failedgen, randoerror, generating, finishGenerating
     values.update({
         'Difficulty': int(values.get('Difficulty')) })
     if values['Num']:
@@ -78,7 +78,7 @@ def rando_thread(window = None, values = None):
 
 
 def main_window(debug):
-    global fileName, finishGenerating, basegame, finishGenerating
+    global fileName, basegame, generating, finishGenerating
     itemPool = [
         [
             ui.Text('Charge Beam'),
@@ -236,7 +236,7 @@ def main_window(debug):
         if event == ui.WINDOW_CLOSED:
             break
 
-        elif event == 'Num':
+        if event == 'Num':
             if len(values['Num']) > 3:
                 window['Num'].update(oldNum)
             for x in range(4):
@@ -247,7 +247,7 @@ def main_window(debug):
                 else:
                     oldNum = values['Num']
 
-        elif event == 'Generate':
+        if event == 'Generate':
             basegame = ui.popup_get_file('Choose base game', no_titlebar=True, file_types=[('GBA File', '*.gba')], history=True, history_setting_filename=os.path.join('.', 'settings.json'))
             if basegame == '':
                 ui.popup('Please select a Metroid Fusion (U) rom.', title='No source rom selected')
@@ -273,11 +273,11 @@ def main_window(debug):
                     window['Patch'].update(disabled=True)
                     window['Generate'].update(disabled=True)
 
-        if generating:
+        while generating:
             ui.popup_animated(ui.DEFAULT_BASE64_LOADING_GIF, 'Generating game, please wait...', time_between_frames=20)
             window.Refresh()
 
-        elif finishGenerating:
+        if finishGenerating:
             ui.popup_animated(None)
             if failedgen:
                 ui.popup('Could not generate a game with the current settings. Try changing your settings.', title='Metroid Fusion Open Randomizer')