From 6b97fbb3ef23be44935026b73cfd09af9a12df19 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Sat, 25 Apr 2020 16:24:33 -0700
Subject: [PATCH] ui: Move settings load out of constructor

---
 ui/xemu-hud.cc | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ui/xemu-hud.cc b/ui/xemu-hud.cc
index f361f3d2b3..9f43a29bfe 100644
--- a/ui/xemu-hud.cc
+++ b/ui/xemu-hud.cc
@@ -943,6 +943,9 @@ static void ShowInputWindow(bool* p_open)
 
 struct SettingsWindow
 {
+    bool dirty;
+    bool pending_restart;
+
     char flash_path[MAX_STRING_LEN];
     char bootrom_path[MAX_STRING_LEN];
     char hdd_path[MAX_STRING_LEN];
@@ -950,18 +953,18 @@ struct SettingsWindow
     char eeprom_path[MAX_STRING_LEN];
     int  memory_idx;
     bool short_animation;
-    bool dirty;
-    bool pending_restart;
 
     SettingsWindow()
     {
-        Load(); // Note: This does not catch updates made elsewhere! That isn't
-                // a problem yet, but in the future might need to be changed to
-                // get most recent data. I put it here so we don't need to sync
-                // settings back to these temporary buffers on every frame.
-                // Please don't do this. If you need it, consider adding an "on
-                // settings updated" callback to sync the updates, if necessary.
+        flash_path[0] = '\0';
+        bootrom_path[0] = '\0';
+        hdd_path[0] = '\0';
+        dvd_path[0] = '\0';
+        eeprom_path[0] = '\0';
+        memory_idx = 0;
+        short_animation = false;
         pending_restart = false;
+        dirty = false;
     }
     
     ~SettingsWindow()