choke on invalid options on the cmd line

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 268d4e6d8242431758a0e6aee59348a5cb4972fe..a4f527b1824690ac6f61731459cc58ece0104dae 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -150,6 +150,8 @@ int main(int argc, char **argv)
         plugin_open("focus");
         plugin_open("keyboard");
         plugin_open("mouse");
+        plugin_open("placement");
+        plugin_open("resistance");
 
        /* get all the existing windows */
        client_manage_all();
@@ -178,7 +180,6 @@ int main(int argc, char **argv)
     XCloseDisplay(ob_display);
 
     if (ob_restart) {
-        ob_restart_path = "";
         if (ob_restart_path != NULL) {
             int argcp;
             char **argvp;
@@ -270,6 +271,10 @@ void parse_args(int argc, char **argv)
                 g_printerr("-rc requires an argument\n");
             else
                 ob_rc_path = argv[++i];
+        } else {
+            g_printerr("Invalid option: '%s'\n\n", argv[i]);
+            print_help();
+            exit(1);
         }
     }
 }