Split up InitMenus

Preparation for the removal of FirstScreen: Separate code that is
executed for all screens from code that is executed for only the
first screen.

Signed-off-by: Tim Wiederhake <twied@gmx.net>

1 files changed, 12 insertions, 10 deletions

diff --git a/src/menus.c b/src/menus.c
index 4b5dd62..1e78a1a 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -133,7 +133,6 @@ void
 InitMenus(void)
 {
     int i, j, k;
-    FuncKey *key;
 
     for (i = 0; i < MAX_BUTTONS + 1; i++)
         for (j = 0; j < NUM_CONTEXTS; j++)
@@ -144,18 +143,21 @@ InitMenus(void)
 
     Scr->DefaultFunction.func = 0;
     Scr->WindowFunction.func = 0;
+}
 
-    if (FirstScreen) {
-        for (key = Scr->FuncKeyRoot.next; key != NULL;) {
-            FuncKey *tmp = key;
+void
+InitMenusFirst(void)
+{
+    FuncKey *key;
 
-            free(key->name);
-            key = key->next;
-            free(tmp);
-        }
-        Scr->FuncKeyRoot.next = NULL;
-    }
+    for (key = Scr->FuncKeyRoot.next; key != NULL;) {
+        FuncKey *tmp = key;
 
+        free(key->name);
+        key = key->next;
+        free(tmp);
+    }
+    Scr->FuncKeyRoot.next = NULL;
 }
 
 /**