qtvcp -change exit clean up code.

Hoping to help the segfault on exit problem - it didn't.
But this does make more logical sense: cleanup before entering close event

Author: c-morley

lib/python/qtvcp/widgets/screen_options.py

@@ -390,21 +390,25 @@ def closeEvent(self, event):
             # system shutdown
             HANDLER = self.QTVCP_INSTANCE_.handler_instance
             if answer == QtWidgets.QMessageBox.DestructiveRole:
+                self.QTVCP_INSTANCE_.settings.sync()
+                self.QTVCP_INSTANCE_.shutdown()
+                self.QTVCP_INSTANCE_.panel_.shutdown()
+                STATUS.shutdown()
                 if 'system_shutdown_request__' in dir(HANDLER):
                     HANDLER.system_shutdown_request__()
                 else:
                     from qtvcp.core import Action
                     ACTION = Action()
                     ACTION.SHUT_SYSTEM_DOWN_PROMPT()
-                if '_hal_cleanup' in dir(HANDLER):
-                    HANDLER._hal_cleanup()
                 event.accept()
             # close linuxcnc
             elif answer:
                 if self.PREFS_ and self.play_sounds and self.shutdown_play_sound:
                     STATUS.emit('play-sound', self.shutdown_exit_sound_type)
-                if '_hal_cleanup' in dir(HANDLER):
-                    HANDLER._hal_cleanup()
+                self.QTVCP_INSTANCE_.settings.sync()
+                self.QTVCP_INSTANCE_.shutdown()
+                self.QTVCP_INSTANCE_.panel_.shutdown()
+                STATUS.shutdown()
                 event.accept()
             # cancel
             elif answer == False:

src/emc/usr_intf/qtvcp/qtvcp.py

@@ -420,10 +420,7 @@ def __init__(self):
 
         LOG.info('Preference path: yellow<{}>'.format(PATH.PREFS_FILENAME))
         # start loop
-        APP.exec_()
-
-        # now shut it all down
-        self.shutdown()
+        APP.exec()
 
     # finds the postgui file name and INI file path
     def postgui(self):
@@ -452,6 +449,7 @@ def postgui_cmd(self):
     # call optional widget cleanup functions
     # shut down STATUS so no error is called
     # close out HAL pins
+    # there is similar code in screen_options
     def shutdown(self,signum=None,stack_frame=None):
         try:
             self.panel.window.shutdown()
@@ -467,7 +465,6 @@ def shutdown(self,signum=None,stack_frame=None):
             self.halcomp.exit()
         except:
             pass
-        sys.exit(0)
 
         # Throws up a dialog with debug info when an error is encountered
     def excepthook(self, exc_type, exc_obj, exc_tb):
@@ -512,4 +509,4 @@ def excepthook(self, exc_type, exc_obj, exc_tb):
 # starts Qtvcp
 if __name__ == "__main__":
         APP = QTVCP()
-
+        sys.exit(0)