aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-01-01 00:10:27 (GMT)
committermarkt <markt>2007-01-01 00:10:27 (GMT)
commite9dd7670f36e8b32ee8dd2b52e1c4f31f808b35c (patch)
tree5efaaf39401ef050e4b14ab78c43562c88e48ae2
parente8a86fb91c5d51d748d2c782ee146b690756f2b7 (diff)
downloadfluxbox-e9dd7670f36e8b32ee8dd2b52e1c4f31f808b35c.zip
fluxbox-e9dd7670f36e8b32ee8dd2b52e1c4f31f808b35c.tar.bz2
don't run [startup] items in apps file on reconfigure when apps file has been modified
-rw-r--r--ChangeLog2
-rw-r--r--src/Remember.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d7b3df..f3fc642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/01/01: 3*07/01/01:
4 * Happy New Year! 4 * Happy New Year!
5 * Don't run [startup] items in apps file on reconfigure (Mark)
6 Remember.cc
5 * Fix data type of data passed to set _NET_FRAME_EXTENTS (Simon) 7 * Fix data type of data passed to set _NET_FRAME_EXTENTS (Simon)
6 (sf.net #1621980) 8 (sf.net #1621980)
7 Similar fix for gnome current workspace... remember that XA_CARDINAL 9 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() {
577 } else { 577 } else {
578 grouped_pats.push_back(pat); 578 grouped_pats.push_back(pat);
579 } 579 }
580 } else if (pos > 0 && strcasecmp(key.c_str(), "startup") == 0) { 580 } else if (pos > 0 && strcasecmp(key.c_str(), "startup") == 0 &&
581 Fluxbox::instance()->isStartup()) {
581 if (!handleStartupItem(line, pos)) { 582 if (!handleStartupItem(line, pos)) {
582 cerr<<"Error reading apps file at line "<<row<<"."<<endl; 583 cerr<<"Error reading apps file at line "<<row<<"."<<endl;
583 } 584 }