removing old Makefile.in, rolling back Makefile.am to before the mappable muse button...

[chaz/openbox] / src / Screen.cc

diff --git a/src/Screen.cc b/src/Screen.cc
index 4716d23a3532e56991d34a30a0f063b7d1ac0846..775254c66d3147c67a23e9ab9b36d5539d52d499 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1217,8 +1217,8 @@ void BScreen::manageWindow(Window w) {
     // desktop windows cant do anything, so we remove all the normal window
     // stuff from them, they are only kept around so that we can keep them on
     // the bottom of the z-order
-    addDesktopWindow(win->getClientWindow());
     win->restore(True);
+    addDesktopWindow(win->getClientWindow());
     delete win;
     return;
   }
@@ -2170,9 +2170,10 @@ void BScreen::toggleFocusModel(FocusModel model) {
   if (model == SloppyFocus) {
     saveSloppyFocus(True);
   } else {
+    // we're cheating here to save writing the config file 3 times
+    resource.auto_raise = False;
+    resource.click_raise = False;
     saveSloppyFocus(False);
-    saveAutoRaise(False);
-    saveClickRaise(False);
   }
 
   updateFocusModel();