1 files changed, 9 insertions, 3 deletions
diff --git a/main.c b/main.c
index 6f591e5f..8cc3e63a 100644
--- a/main.c
+++ b/main.c
@@ -279,14 +279,12 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
             continue;
         }
         else if (!strcmp (parg, "--gui")) {
+            // need to skip --gui here, it is handled in the client cmdline
             parg += strlen (parg);
             parg++;
             if (parg >= pend) {
-                fprintf (stderr, "--gui parameter needs an argument. E.g. GTK2 or GTK3.\n");
                 break;
             }
-            strncpy (use_gui_plugin, parg, sizeof(use_gui_plugin) - 1);
-            use_gui_plugin[sizeof(use_gui_plugin) - 1] = 0;
             parg += strlen (parg);
             parg++;
             continue;
@@ -874,6 +872,14 @@ main (int argc, char *argv[]) {
             fprintf (stderr, "DeaDBeeF " VERSION " Copyright © 2009-2013 Alexey Yakovenko\n");
             return 0;
         }
+        else if (!strcmp (argv[i], "--gui")) {
+            if (i == argc-1) {
+                break;
+            }
+            i++;
+            strncpy (use_gui_plugin, argv[i], sizeof(use_gui_plugin) - 1);
+            use_gui_plugin[sizeof(use_gui_plugin) - 1] = 0;
+        }
     }
 
     trace ("installdir: %s\n", dbinstalldir);