1 files changed, 10 insertions, 2 deletions
diff --git a/source/rofi.c b/source/rofi.c
index fbb0d53e..cc529527 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -65,7 +65,16 @@
 // Pidfile.
 char             *pidfile   = NULL;
 const char       *cache_dir = NULL;
-struct xkb_stuff xkb        = { NULL };
+struct xkb_stuff xkb        = {
+    .xcb_connection = NULL,
+    .context        = NULL,
+    .keymap         = NULL,
+    .state          = NULL,
+    .compose        = {
+        .table = NULL,
+        .state = NULL
+    }
+};
 char             *config_path = NULL;
 // Array of modi.
 Mode             **modi   = NULL;
@@ -378,7 +387,6 @@ static int add_mode ( const char * token )
         else{
             // Report error, don't continue.
             fprintf ( stderr, "Invalid script switcher: %s\n", token );
-            token = NULL;
         }
     }
     return ( index == num_modi ) ? -1 : (int) index;