Mercurial Repositories > eric / changeset

--- a/Toolbox/Startup.py	Thu Jan 08 18:48:52 2015 +0100
+++ b/Toolbox/Startup.py	Mon Jan 12 19:29:14 2015 +0100
@@ -222,13 +222,14 @@
     """
     handleArgs(argv, appinfo)
     if app is None:
+        # set the library paths for plugins
+        setLibraryPaths()
         app = E5Application(argv)
     app.setQuitOnLastWindowClosed(quitOnLastWindowClosed)
     
     # the following code depends upon a valid application object
     import Preferences
     
-    setLibraryPaths()
     initializeResourceSearchPath()
     QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
     

--- a/eric6.py	Thu Jan 08 18:48:52 2015 +0100
+++ b/eric6.py	Mon Jan 12 19:29:14 2015 +0100
@@ -229,9 +229,11 @@
     if not Globals.checkBlacklistedVersions():
         sys.exit(100)
     
+    from Toolbox import Startup
+    # set the library paths for plugins
+    Startup.setLibraryPaths()
+
     app = E5Application(sys.argv)
-    
-    from Toolbox import Startup
     ddindex = Startup.handleArgs(sys.argv, appinfo)
     
     logging.debug("Importing Preferences")
@@ -240,9 +242,6 @@
     if Preferences.getUI("SingleApplicationMode"):
         handleSingleApplication(ddindex)
     
-    # set the library paths for plugins
-    Startup.setLibraryPaths()
-
     # set the search path for icons
     Startup.initializeResourceSearchPath()
 

--- a/eric6_trpreviewer.py	Thu Jan 08 18:48:52 2015 +0100
+++ b/eric6_trpreviewer.py	Mon Jan 12 19:29:14 2015 +0100
@@ -71,6 +71,9 @@
                                   "TR file previewer",
                                   options)
     
+    # set the library paths for plugins
+    Startup.setLibraryPaths()
+    
     app = E5Application(sys.argv)
     client = TRSingleApplicationClient()
     res = client.connect()