aboutsummaryrefslogtreecommitdiff
path: root/src/Remember.cc
diff options
context:
space:
mode:
authormarkt <markt>2006-08-06 22:33:54 (GMT)
committermarkt <markt>2006-08-06 22:33:54 (GMT)
commit2d14b33ef4de3e8cd95474bc103fe3dba5cbb33b (patch)
tree58569f71d21584a1bf82e509ba9bf1e5123263c2 /src/Remember.cc
parent7b49c4a00bc8d0b9685868e5ad4699b8c5530ab9 (diff)
downloadfluxbox-2d14b33ef4de3e8cd95474bc103fe3dba5cbb33b.zip
fluxbox-2d14b33ef4de3e8cd95474bc103fe3dba5cbb33b.tar.bz2
distinguish between startup and restart
Diffstat (limited to 'src/Remember.cc')
-rw-r--r--src/Remember.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Remember.cc b/src/Remember.cc
index 9569b80..cf2c934 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -963,7 +963,7 @@ void Remember::setupFrame(FluxboxWindow &win) {
963 return; // nothing to do 963 return; // nothing to do
964 964
965 // first, set the options that aren't preserved as window properties on 965 // first, set the options that aren't preserved as window properties on
966 // restart, then return if fluxbox is starting up -- we want restart to 966 // restart, then return if fluxbox is restarting -- we want restart to
967 // disturb the current window state as little as possible 967 // disturb the current window state as little as possible
968 Window leftwin = winclient.getGroupLeftWindow(); 968 Window leftwin = winclient.getGroupLeftWindow();
969 if (app->is_grouped && app->group == 0 && leftwin == None) 969 if (app->is_grouped && app->group == 0 && leftwin == None)
@@ -978,12 +978,12 @@ void Remember::setupFrame(FluxboxWindow &win) {
978 if (app->decostate_remember) 978 if (app->decostate_remember)
979 win.setDecorationMask(app->decostate); 979 win.setDecorationMask(app->decostate);
980 980
981 // now check if fluxbox is starting up
982 if (Fluxbox::instance()->isStartup())
983 return;
984
985 BScreen &screen = winclient.screen(); 981 BScreen &screen = winclient.screen();
986 982
983 // now check if fluxbox is restarting
984 if (screen.isRestart())
985 return;
986
987 if (app->workspace_remember) { 987 if (app->workspace_remember) {
988 // we use setWorkspace and not reassoc because we're still initialising 988 // we use setWorkspace and not reassoc because we're still initialising
989 win.setWorkspace(app->workspace); 989 win.setWorkspace(app->workspace);
@@ -1050,7 +1050,7 @@ void Remember::setupFrame(FluxboxWindow &win) {
1050 1050
1051void Remember::setupClient(WinClient &winclient) { 1051void Remember::setupClient(WinClient &winclient) {
1052 1052
1053 if (Fluxbox::instance()->isStartup()) 1053 if (winclient.screen().isRestart())
1054 return; // don't mess up windows on restart 1054 return; // don't mess up windows on restart
1055 1055
1056 Application *app = find(winclient); 1056 Application *app = find(winclient);