Quellcode durchsuchen

- fixed an error that did not allowed for the older preferences to be deleted when installing a different version of the software

Marius Stanciu vor 5 Jahren
Ursprung
Commit
bd98bb42c4
3 geänderte Dateien mit 11 neuen und 10 gelöschten Zeilen
  1. 1 0
      CHANGELOG.md
  2. 2 2
      app_Main.py
  3. 8 8
      defaults.py

+ 1 - 0
CHANGELOG.md

@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
 - in Geometry UI and for Solderpaste Tool replaced the pop up window that is launched when using shortcut key with one that has the context menu translated
 - some UI cleanup in the Geometry UI
 - updated the translation strings except Russian which could be in the works
+- fixed an error that did not allowed for the older preferences to be deleted when installing a different version of the software
 
 27.10.2020
 

+ 2 - 2
app_Main.py

@@ -164,8 +164,8 @@ class App(QtCore.QObject):
     # ###############################################################################################################
     # ################################### Version and VERSION DATE ##################################################
     # ###############################################################################################################
-    version = "Unstable Version"
-    # version = 8.994
+    # version = "Unstable Version"
+    version = 8.994
     version_date = "2020/10/30"
     beta = True
 

+ 8 - 8
defaults.py

@@ -778,14 +778,14 @@ class FlatCAMDefaults:
             with open(file_path, "r") as file:
                 f_defaults = simplejson.loads(file.read())
 
-                # if the file is not empty
-                if f_defaults:
-                    # if it has the same version do nothing
-                    if str(f_defaults['version']) == str(version):
-                        return
-                    # if the versions differ then remove the file
-                    os.chmod(file_path, stat.S_IRWXO | stat.S_IWRITE | stat.S_IWGRP)
-                    os.remove(file_path)
+            # if the file is not empty
+            if f_defaults:
+                # if it has the same version do nothing
+                if str(f_defaults['version']) == str(version):
+                    return
+                # if the versions differ then remove the file
+                os.chmod(file_path, stat.S_IRWXO | stat.S_IWRITE | stat.S_IWGRP)
+                os.remove(file_path)
 
         cls.factory_defaults['version'] = version