Changeset 5842

Timestamp:

08/20/10 09:06:59 (3 years ago)

Author:

getxsick

Message:

fix #370 : this is for ctrl+c issue

Location:

network-scanner/trunk

Files:

• bin/umit (modified) (2 diffs)
• umit/gui/App.py (modified) (3 diffs)

network-scanner/trunk/bin/umit

@@ -41 +41 @@
 from umit.core.Version import VERSION
 from umit.core.Utils import development_mode
-
 
 class UmitExceptionHook(object):
@@ -201 +200 @@
 
 def main(args):
-    # Setting the umit home directory
-    from umit.core.Paths import Path
-    Path.set_umit_conf(os.path.dirname(args[0]))
-    #################################
-    Path.set_running_path(os.path.abspath(os.path.dirname(args[0])))
-
-    # Check permissions
-    from umit.gui.Utils import verify_config_access
-    verify_config_access()
-    
-    from umit.gui.App import App
-
-    umit_app = App()
+    try:
+        # Setting the umit home directory
+        from umit.core.Paths import Path
+        Path.set_umit_conf(os.path.dirname(args[0]))
+        #################################
+        Path.set_running_path(os.path.abspath(os.path.dirname(args[0])))
+
+        # Check permissions
+        from umit.gui.Utils import verify_config_access
+        verify_config_access()
+        
+        from umit.gui.App import App
+
+        umit_app = App()
+    except KeyboardInterrupt:
+        # there is no need to run safe_shutdown()
+        # cause we haven't created App instance yet
+        sys.exit(signal.SIGINT)
 
     if os.name == "posix":

network-scanner/trunk/umit/gui/App.py

@@ -47 +47 @@
 class App:
     def __init__(self, args=sys.argv):
+        self.main_window = None
         # Initialite the PluginEngine
         PluginEngine()
@@ -79 +80 @@
         log.debug("SIGNUM: %s" % signum)
 
-        try:
+        if self.main_window:
             scans = self.main_window.scan_notebook.get_children()
             for scan in scans:
@@ -87 +88 @@
                 self.main_window.scan_notebook.remove(scan)
                 del(scan)
-        except NameError:
-            pass
 
-        self.main_window._exit_cb()
+            self.main_window._exit_cb()
         sys.exit(signum)