Handle corrupted configuration file, fix #37

interlark · Sep 8, 2022 · 13bf95a · 13bf95a
1 parent fba992f
commit 13bf95a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/gui/app.py b/gui/app.py
@@ -205,9 +205,14 @@ async def read_window() -> Any:
 
         # Click "Start"
         elif event == '-BTN_START-':
+            # Sync settings
             if not sync_settings():
                 continue
 
+            # Save settings
+            save_settings(settings)
+
+            # Lock user inputs
             lock_controls()
 
             loop = asyncio.get_running_loop()
@@ -227,8 +232,4 @@ async def read_window() -> Any:
             n, total = values['@PROGRESS_UPDATE']
             window['-PROGRESSBAR-'].update(current_count=n, max=total)
 
-    # Save settings before exit
-    sync_settings(verbose=False)
-    save_settings(settings)
-
     window.close()
diff --git a/gui/settings.py b/gui/settings.py
@@ -22,7 +22,11 @@ def load_settings() -> dict[str, Any]:
     settings = default_settings()
     settings_path = config_path() / 'settings.cfg'
     if settings_path.is_file():
-        user_settings = json.loads(settings_path.read_text(encoding='utf-8'))
+        try:
+            user_settings = json.loads(settings_path.read_text(encoding='utf-8'))
+        except json.JSONDecodeError:
+            user_settings = {}
+
         settings = {**settings, **user_settings}
     else:
         save_settings(settings)