Mercurial Repositories > eric / changeset

--- a/eric7/UI/UserInterface.py	Sat Apr 02 17:07:56 2022 +0200
+++ b/eric7/UI/UserInterface.py	Sun Apr 03 17:23:31 2022 +0200
@@ -4490,7 +4490,7 @@
         @type str
         """
         ericApp().closeAllWindows()
-        program = sys.executable
+        program = sys.executable.replace("w.exe", ".exe")
         ericStartArgs = ["-m", "eric7", "--start-session"]
         ericStartArgs.extend(self.__restartArgs)
         

--- a/eric7/UI/upgrader.py	Sat Apr 02 17:07:56 2022 +0200
+++ b/eric7/UI/upgrader.py	Sun Apr 03 17:23:31 2022 +0200
@@ -62,14 +62,14 @@
         ddindex = sys.argv.index("--")
     except ValueError:
         # '--' was not found. Start eric with all parameters given.
-        ddindex = 1
+        ddindex = 0
     
-    ericStartArgs = sys.argv[ddindex + 1:]
+    ericStartArgs = sys.argv[ddindex + 1:] if bool(ddindex) else []
     if not ericStartArgs:
         # create default start arguments
         ericStartArgs = ["-m", "eric7", "--start-session"]
     
-    upgraderArgs = sys.argv[1:ddindex]
+    upgraderArgs = sys.argv[1:ddindex] if bool(ddindex) else sys.argv[:]
     
     upgradeType = ""
     upgradeDelay = 2