Index: programs/mythtv-setup/main.cpp
===================================================================
--- programs/mythtv-setup/main.cpp.orig	2009-04-21 14:21:13.000000000 -0400
+++ programs/mythtv-setup/main.cpp	2009-04-21 15:04:47.000000000 -0400
@@ -124,14 +124,24 @@
     bool    use_display = true;
 
 #ifdef USING_X11
-    // Remember any -display or -geometry argument
-    // which QApplication init will remove.
-    for(int argpos = 1; argpos + 1 < argc; ++argpos)
+    // Remember any -display or -geometry argument which QApplication init will
+    // remove and unset use_display for command-line usage.
+    for(int argpos = 1; argpos < argc; ++argpos)
     {
         if (!strcmp(argv[argpos],"-geometry"))
-            geometry = argv[argpos+1];
+        {
+            if (argc-1 > argpos)
+                geometry = argv[argpos+1];
+        }
         else if (!strcmp(argv[argpos],"-display"))
-            display = argv[argpos+1];
+        {
+            if (argc-1 > argpos)
+                display = argv[argpos+1];
+        }
+        else if (!strcmp(argv[argpos],"-h") ||
+                 !strcmp(argv[argpos],"--help") ||
+                 !strcmp(argv[argpos],"--usage"))
+            use_display = false;
         else if (QString(argv[argpos]).left(6) == "--scan")
         {
             use_display = false;