From e9dd7670f36e8b32ee8dd2b52e1c4f31f808b35c Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Mon, 1 Jan 2007 00:10:27 +0000
Subject: don't run [startup] items in apps file on reconfigure when apps file
 has been modified

---
 ChangeLog       | 2 ++
 src/Remember.cc | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8d7b3df..f3fc642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 Changes for 1.0rc3:
 *07/01/01:
    * Happy New Year!
+   * Don't run [startup] items in apps file on reconfigure (Mark)
+     Remember.cc
    * Fix data type of data passed to set _NET_FRAME_EXTENTS (Simon)
      (sf.net #1621980)
      Similar fix for gnome current workspace... remember that XA_CARDINAL
diff --git a/src/Remember.cc b/src/Remember.cc
index 9035325..6f41528 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -577,7 +577,8 @@ void Remember::reconfigure() {
                     } else {
                         grouped_pats.push_back(pat);
                     }
-                } else if (pos > 0 && strcasecmp(key.c_str(), "startup") == 0) {
+                } else if (pos > 0 && strcasecmp(key.c_str(), "startup") == 0 &&
+                           Fluxbox::instance()->isStartup()) {
                     if (!handleStartupItem(line, pos)) {
                         cerr<<"Error reading apps file at line "<<row<<"."<<endl;
                     }
-- 
cgit v0.11.2