Mercurial Repositories > eric / file diff

--- a/src/eric7/eric7_ide.py	Fri Oct 21 09:28:18 2022 +0200
+++ b/src/eric7/eric7_ide.py	Mon Oct 24 14:23:39 2022 +0200
@@ -24,13 +24,14 @@
 
 # generate list of arguments to be remembered for a restart
 restartArgsList = [
+    "--config",
+    "--debug",
+    "--disable-crash",
+    "--disable-plugin",
+    "--no-multimedia",
     "--no-splash",
     "--plugin",
-    "--debug",
-    "--config",
     "--settings",
-    "--disable-crash",
-    "--disable-plugin",
 ]
 restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList]
 
@@ -102,41 +103,34 @@
     client = EricSingleApplicationClient()
     res = client.connect()
     if res > 0:
-        if "--no-splash" in sys.argv and sys.argv.index("--no-splash") < ddindex:
-            sys.argv.remove("--no-splash")
-            ddindex -= 1
-        if "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex:
-            sys.argv.remove("--no-open")
-            ddindex -= 1
-        if "--no-crash" in sys.argv and sys.argv.index("--no-crash") < ddindex:
-            sys.argv.remove("--no-crash")
-        if (
-            "--disable-crash" in sys.argv
-            and sys.argv.index("--disable-crash") < ddindex
+        for switch in (
+            "--debug",
+            "--disable-crash",
+            "--no-crash",
+            "--no-multimedia",
+            "--no-open",
+            "--no-splash",
+            "--small-screen",
         ):
-            sys.argv.remove("--disable-crash")
-            ddindex -= 1
-        if "--debug" in sys.argv and sys.argv.index("--debug") < ddindex:
-            sys.argv.remove("--debug")
-            ddindex -= 1
-        for arg in sys.argv:
-            if arg.startswith("--config=") and sys.argv.index(arg) < ddindex:
-                sys.argv.remove(arg)
+            if switch in sys.argv and sys.argv.index(switch) < ddindex:
+                sys.argv.remove(switch)
                 ddindex -= 1
-                break
-        for arg in sys.argv:
-            if arg.startswith("--plugin=") and sys.argv.index(arg) < ddindex:
-                sys.argv.remove(arg)
-                ddindex -= 1
-                break
         for arg in sys.argv[:]:
-            if arg.startswith("--disable-plugin=") and sys.argv.index(arg) < ddindex:
-                sys.argv.remove(arg)
-                ddindex -= 1
+            for switch in (
+                "--config=",
+                "--plugin=",
+                "--disable-plugin=",
+                "--settings=",
+            ):
+                if arg.startswith(switch) and sys.argv.index(switch) < ddindex:
+                    sys.argv.remove(arg)
+                    ddindex -= 1
+                    break
 
         if len(sys.argv) > 1:
             client.processArgs(sys.argv[1:])
         sys.exit(0)
+
     elif res < 0:
         print("eric7: {0}".format(client.errstr()))
         # __IGNORE_WARNING_M801__
@@ -247,8 +241,9 @@
             "use the given directory as the one containing the config files",
         ),
         ("--debug", "activate debugging output to the console"),
+        ("--no-multimedia", "disable the support of multimedia functions"),
+        ("--no-open", "don't open anything at startup except that given in command"),
         ("--no-splash", "don't show the splash screen"),
-        ("--no-open", "don't open anything at startup except that given in command"),
         ("--no-crash", "don't check for a crash session file on startup"),
         ("--disable-crash", "disable the support for crash sessions"),
         (