fixed --gui handling

1 files changed, 14 insertions, 9 deletions

diff --git a/main.c b/main.c
index 67f5ce6a..3f850329 100644
--- a/main.c
+++ b/main.c
@@ -278,6 +278,19 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
             }
             continue;
         }
+        else if (!strcmp (parg, "--gui")) {
+            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;
+        }
         else if (parg[0] != '-') {
             break; // unknown option is filename
         }
@@ -858,17 +871,9 @@ main (int argc, char *argv[]) {
             return 0;
         }
         else if (!strcmp (argv[i], "--version")) {
-            fprintf (stdout, "DeaDBeeF " VERSION " Copyright © 2009-2013 Alexey Yakovenko\n");
+            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);