Fix recent --spice-controller regression, add error message

The current code will attempt to dereference args if
--spice-controller, even if args is NULL.

Let's not accept any extra argument/uri on the command line if using
the controller. Beside, the conditionnal block looks better outside of
the if condition.

1 files changed, 10 insertions, 3 deletions

diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c
index f60edb6..64e0cbe 100644
--- a/src/remote-viewer-main.c
+++ b/src/remote-viewer-main.c
@@ -252,13 +252,20 @@ main(int argc, char **argv)
 
     g_option_context_free(context);
 
-    if ((!args || (g_strv_length(args) != 1))
 #if HAVE_SPICE_GTK
-        && !controller
+    if (controller) {
+        if (args) {
+            g_printerr(_("Error: extra arguments given while using Spice controller\n"));
+            goto cleanup;
+        }
+    } else
 #endif
-        ) {
+    if (!args || g_strv_length(args) == 0) {
         if (connect_dialog(&uri) != 0)
             goto cleanup;
+    } else if (g_strv_length(args) > 1) {
+        g_printerr(_("Error: can't handle multiple URIs\n"));
+        goto cleanup;
     } else {
         uri = g_strdup(args[0]);
     }