Changeset 373:cf2b6b8a3973 for src/mlx/mlx.py

Timestamp:

12/18/12 10:08:43 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Added support for a secondary instance (#157)

File:

• src/mlx/mlx.py (modified) (4 diffs)

src/mlx/mlx.py

@@ -3 +3 @@
 from i18n import setLanguage
 from sound import initializeSound
+from util import secondaryInstallation
 
 import os
@@ -51 +52 @@
 
     instance.close()
-    os.execv(programPath, args)    
+    os.execv(programPath, args)
 
 #--------------------------------------------------------------------------------------
@@ -60 +61 @@
 
     global instance
-    instance = SingleInstance("mlx", raiseCallbackWrapper)
+    instance = SingleInstance("mlx" + ("-secondary" if secondaryInstallation
+                                       else ""), raiseCallbackWrapper)
     if not instance: return
 
@@ -69 +71 @@
 
     if (len(sys.argv)<=1 or sys.argv[1]!="usedeflang") and config.setupLocale():
-        restart(["usedeflang"])
+        restart(["usedeflang"] + (["secondary"] if secondaryInstallation else []))
 
     setLanguage(programDirectory, config.getLanguage())
-    
+
     from .gui.gui import GUI
     gui = GUI(programDirectory, config)
-    
+
     sys.stdout = StdIOHandler(gui)
     sys.stderr = StdIOHandler(gui)