Avoid loading invalid numeric config entries

Don't try to load old style "true"/"false" config entries as integer. This
would cause an value error and crash m64py. Instead try to load the content
only when it is valid and otherwise use the m64py default value.

Author: Fayvel Victor

src/m64py/frontend/mainwindow.py

@@ -78,8 +78,7 @@ def __init__(self, optparse):
         self.settings = Settings(self)
         self.worker = Worker(self)
 
-        self.vidext = bool(
-            int(self.settings.qset.value("enable_vidext", 1)))
+        self.vidext = bool(self.settings.get_int_safe("enable_vidext", 1))
 
         self.create_state_slots()
         self.create_widgets()
@@ -126,7 +125,7 @@ def window_size_triggered(self, size):
             # event.ignore() doesn't work on windows
             if not sys.platform == "win32":
                 if not fullscreen and \
-                        bool(int(self.settings.qset.value("keep_aspect", 1))):
+                        bool(self.settings.get_int_safe("keep_aspect", 1)):
                     width, height = self.keep_aspect(size)
 
             self.worker.core.config.open_section("Video-General")

src/m64py/frontend/settings.py

@@ -195,6 +195,12 @@ def set_paths(self):
         self.pathPlugins.setText(path_plugins)
         self.pathData.setText(path_data)
 
+    def get_int_safe(self, key, default):
+        try:
+            return int(self.qset.value(key, default))
+        except ValueError:
+            return default
+
     def set_video(self):
         self.comboResolution.clear()
         for mode in MODES:
@@ -212,7 +218,7 @@ def set_video(self):
         self.comboResolution.setCurrentIndex(index)
 
         self.checkEnableVidExt.setChecked(
-            bool(int(self.qset.value("enable_vidext", 1))))
+            bool(self.get_int_safe("enable_vidext", 1)))
 
         self.checkFullscreen.setChecked(
             bool(self.core.config.get_parameter("Fullscreen")))
@@ -222,10 +228,10 @@ def set_video(self):
             self.checkKeepAspect.setChecked(False)
             self.checkKeepAspect.setEnabled(False)
         else:
-            keep_aspect = bool(int(self.qset.value("keep_aspect", 1)))
+            keep_aspect = bool(self.get_int_safe("keep_aspect", 1))
             self.checkKeepAspect.setChecked(keep_aspect)
 
-        disable_screensaver = bool(int(self.qset.value("disable_screensaver", 1)))
+        disable_screensaver = bool(self.get_int_safe("disable_screensaver", 1))
         self.checkDisableScreenSaver.setChecked(disable_screensaver)
 
     def set_core(self):

src/m64py/frontend/worker.py

@@ -179,17 +179,17 @@ def rom_open(self):
             del romfile
             self.core.rom_get_header()
             self.core.rom_get_settings()
-            if bool(int(self.settings.qset.value(
-                    "disable_screensaver", 1))):
+            if bool(self.settings.get_int_safe(
+                    "disable_screensaver", 1)):
                 screensaver.disable()
             self.parent.rom_opened.emit()
             self.parent.recent_files.add(self.filepath)
 
     def rom_close(self):
         """Closes ROM."""
         self.core.rom_close()
-        if bool(int(self.settings.qset.value(
-                "disable_screensaver", 1))):
+        if bool(self.settings.get_int_safe(
+                "disable_screensaver", 1)):
             screensaver.enable()
         self.parent.rom_closed.emit()
 
@@ -306,13 +306,11 @@ def toggle_pause(self):
         """Toggles pause."""
         if self.state == M64EMU_RUNNING:
             self.core.pause()
-            if bool(int(self.settings.qset.value(
-                    "disable_screensaver", 1))):
+            if bool(self.settings.get_int_safe("disable_screensaver", 1)):
                 screensaver.enable()
         elif self.state == M64EMU_PAUSED:
             self.core.resume()
-            if bool(int(self.settings.qset.value(
-                    "disable_screensaver", 1))):
+            if bool(self.settings.get_int_safe("disable_screensaver", 1)):
                 screensaver.disable()
         self.toggle_actions()