- fixed issue when rebooting from within in cx_freezed state (it issued a startup arg with the path to FlatCAM.exe but that triggered the last sys.exit(2) that I had in the App.args_at_startup())

- modified the make_win script for the presence of MatPlotLib

FlatCAMApp.py

@@ -97,6 +97,7 @@ class App(QtCore.QObject):
     except getopt.GetoptError:
         print(cmd_line_help)
         sys.exit(2)
+
     for opt, arg in cmd_line_options:
         if opt == '-h':
             print(cmd_line_help)
@@ -2629,8 +2630,8 @@ class App(QtCore.QObject):
                 print("ERROR: ", ext)
                 sys.exit(2)
 
-            # accept some type file as command line parameter: FlatCAM project, FlatCAM preferences or scripts
+        # accept some type file as command line parameter: FlatCAM project, FlatCAM preferences or scripts
-            # the path/file_name must be enclosed in quotes if it contain spaces
+        # the path/file_name must be enclosed in quotes if it contain spaces
         if App.args:
             self.args_at_startup.emit(App.args)
 
@@ -2764,8 +2765,10 @@ class App(QtCore.QObject):
                             return
 
                 # if it reached here without already returning then the app was registered with a file that it does not
-                # recognize therefore we must quit
+                # recognize therefore we must quit but take into consideration the app reboot from within, in that case
-                sys.exit(2)
+                # the args_to_process will contain the path to the FlatCAM.exe (cx_freezed executable)
+                if 'FlatCAM' not in args_to_process:
+                    sys.exit(2)
 
     def set_ui_title(self, name):
         """

README.md

@@ -9,7 +9,7 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
-25.09.2019
+26.09.2019
 
 - added a Copy All button in the Code Editor, clicking this button will copy all text in the editor to the clipboard
 - added a 'Milling Type' radio button in Geometry Editor Preferences to contorl the type of geometry will be generated in the Geo Editor (for conventional milling or for the climb milling)
@@ -20,6 +20,8 @@ CAD program, and create G-Code for Isolation routing.
 - German Google-translation update to 100%
 - updated the other languages and the .POT file
 - changed some strings (that should not have been included for translation) and updated language files and the .POT file
+- fixed issue when rebooting from within in cx_freezed state (it issued a startup arg with the path to FlatCAM.exe but that triggered the last sys.exit(2) that I had in the App.args_at_startup())
+- modified the make_win script for the presence of MatPlotLib
 
 25.09.2019
 

make_win.py

@@ -45,6 +45,7 @@ include_files.append((os.path.join(site_dir, "svg/path"), "svg"))
 include_files.append((os.path.join(site_dir, "vispy"), "vispy"))
 include_files.append((os.path.join(site_dir, "vispy/app"), "vispy/app"))
 include_files.append((os.path.join(site_dir, "vispy/app/backends"), "vispy/app/backends"))
+include_files.append((os.path.join(site_dir, "matplotlib"), "matplotlib"))
 include_files.append((os.path.join(site_dir, "rtree"), "rtree"))
 
 if platform.architecture()[0] == '64bit':