X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=fb19cbdfe76ad9528c796aff42b8b93d3c3f8973;hb=1aac72bc4cfffdd816347d305624b15d0ae2112e;hp=0551a587d23724ce7900a56dcd9bafe5dece18ea;hpb=2f0e73cf9d20154c5c84b6ea90e658cf44a6f0c4;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 0551a587..fb19cbdf 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -21,7 +21,6 @@
 #include "openbox.h"
 #include "session.h"
 #include "dock.h"
-#include "modkeys.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -204,7 +203,7 @@ gint main(gint argc, gchar **argv)
 
     if (screen_annex()) { /* it will be ours! */
         do {
-            modkeys_startup(reconfigure);
+            if (reconfigure) obt_keyboard_reload();
 
             /* get the keycodes for keys we use */
             keys[OB_KEY_RETURN] = modkeys_sym_to_code(XK_Return);
@@ -359,7 +358,6 @@ gint main(gint argc, gchar **argv)
             event_shutdown(reconfigure);
             config_shutdown();
             actions_shutdown(reconfigure);
-            modkeys_shutdown(reconfigure);
         } while (reconfigure);
     }