From 36debc8bd40d674fcbe7a67eae5523a313397e52 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Wed, 28 Dec 2005 09:59:53 +0000
Subject: [PATCH] Run menu generation on startup only if menus subdir doesn't
 exist.

SVN revision: 19338
---
 src/E.h    | 1 +
 src/main.c | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/E.h b/src/E.h
index d2557492..16143260 100644
--- a/src/E.h
+++ b/src/E.h
@@ -563,6 +563,7 @@ typedef struct
    char                keybinds_changed;
    char                showing_desktop;
    Window              button_proxy_win;
+   char                firsttime;
 }
 EMode;
 
diff --git a/src/main.c b/src/main.c
index c5f89947..fbedb57a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -299,7 +299,6 @@ main(int argc, char **argv)
    if (!Mode.wm.restart)
       StartupWindowsOpen();
 
-   Conf.startup.firsttime = 0;
    Mode.wm.save_ok = Conf.autosave;
    Mode.wm.startup = 0;
    autosave();
@@ -498,7 +497,7 @@ RunInitPrograms(void)
 
    SessionHelper(ESESSION_START);
 
-   if (Conf.startup.firsttime && Mode.wm.master)
+   if (Mode.firsttime && Mode.wm.master)
      {
 	RunMenuGen();
 	RunDocBrowser();
@@ -660,6 +659,9 @@ EDirsSetup(void)
    else
       E_md(s);
 
+   Esnprintf(s, sizeof(s), "%s/menus", EDirUser());
+   Mode.firsttime = !exists(s);
+
    EDirMake(EDirUser(), "themes");
    EDirMake(EDirUser(), "backgrounds");
    EDirMake(EDirUser(), "menus");