Changeset 247:12a62baf908f

Timestamp:

06/12/12 18:30:23 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Hopefully fixed the problem of not restarting properly

Location:

src/mlx

Files:

• mlx.py (modified) (4 diffs)
• singleton.py (modified) (4 diffs)

src/mlx/mlx.py

@@ -7 +7 @@
 import os
 import sys
+
+#--------------------------------------------------------------------------------------
+
+instance = None
 
 #--------------------------------------------------------------------------------------
@@ -24 +28 @@
 def restart(args = []):
     """Restart the program with the given arguments."""
-    print "Restarting with args", args
+    #print "Restarting with args", args
     programPath = os.path.join(os.path.dirname(sys.argv[0]),
                                "runmlx.exe" if os.name=="nt" else "runmlx.sh")
@@ -38 +42 @@
     args = [programPath] + args
 
+    instance.close()
     os.execv(programPath, args)    
 
@@ -46 +51 @@
     from singleton import SingleInstance, raiseCallbackWrapper
 
+    global instance
     instance = SingleInstance("mlx", raiseCallbackWrapper)
     if not instance: return

src/mlx/singleton.py

@@ -95 +95 @@
                 self._notifySingleton()
 
+        def close(self):
+            """Close the instance by closing the mutex."""
+            if self._mutex:
+                win32api.CloseHandle(self._mutex)
+                self._mutex = None
+
         def _getPipeName(self):
             """Get the name of the pipe to be used for communication."""
@@ -127 +133 @@
         def __del__(self):
             """Destroy the object."""
-            if self._mutex:
-                win32api.CloseHandle(self._mutex)
+            self.close()
+                
 #----------------------------------------------------------------------------
 
@@ -196 +202 @@
             else:
                 self._notifySingleton()
+
+        def close(self):
+            """Close the instance by closing the mutex."""
+            if self._isSingle:
+                if self._lockFile:
+                    self._lockFile.close()
+                    self._lockFile = None
+                    try:
+                        os.remove(self._lockName)
+                    except:
+                        pass
+                    try:
+                        os.remove(self._socketName)
+                    except:
+                        pass
+                
 
         def _startSocketServer(self, raiseCallback):
@@ -224 +246 @@
         def __del__(self):
             """Destroy the object."""
-            if self._isSingle:
-                self._lockFile.close()
-                try:
-                    os.remove(self._lockName)
-                except:
-                    pass
-                try:
-                    os.remove(self._socketName)
-                except:
-                    pass
+            self.close()
                 
 #----------------------------------------------------------------------------