Merge branch 'Beta'

Conflicts:
	flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py

flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py

@@ -184,13 +184,20 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI2):
     def on_theme_change(self):
         # FIXME: this should be moved out to a view model
         val = self.theme_field.get_value()
-        qsettings = QSettings("Open Source", "FlatCAM")
-        qsettings.setValue("theme", val)
 
-        # This will write the setting to the platform specific storage.
-        del qsettings
+        theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
+        if theme_settings.contains("theme"):
+            theme = theme_settings.value('theme', type=str)
+        else:
+            theme = 'white'
 
-        self.app.on_app_restart()
+        if val != theme:
+            theme_settings.setValue("theme", val)
+
+            # This will write the setting to the platform specific storage.
+            del theme_settings
+
+            self.app.on_app_restart()
 
     def on_layout(self, index=None, lay=None):
         if lay: