all repos — openbox @ 5067369f76f1f0db140a0e4c2c9af43982290183

openbox fork - make it a bit more like ryudo 

fix 2 bus errors on osx:
 - it's std::string doesnt like being set to NULL.
 - in Window.cc, caught someone using a membr variable after calling 'delete this'. bad.
Dana Jansens danakj@orodu.net
commit

5067369f76f1f0db140a0e4c2c9af43982290183

parent

1b129560d033d6c560bb99e5e8465a3b075623cd

2 files changed, 8 insertions(+), 4 deletions(-)

jump to
M src/Screen.cc → src/Screen.cc 
@@ -1402,8 +1402,13 @@ 
 void BScreen::LoadStyle(void) {
   Resource &conf = resource.styleconfig;
   
-  conf.setFile(openbox.getStyleFilename());
-  if (!conf.load()) {
+  const char *sfile = openbox.getStyleFilename();
+  bool loaded = false;
+  if (sfile != NULL) {
+    conf.setFile(sfile);
+    loaded = conf.load();
+  }
+  if (!loaded) {
     conf.setFile(DEFAULTSTYLE);
     if (!conf.load()) {
       fprintf(stderr, i18n->getMessage(ScreenSet, ScreenDefaultStyleLoadFail,
M src/Window.cc → src/Window.cc 
@@ -168,9 +168,8 @@ 
 #ifdef    SLIT
   if (client.initial_state == WithdrawnState) {
     screen->getSlit()->addClient(client.window);
+    openbox.ungrab();
     delete this;
-
-    openbox.ungrab();
     return;
   }
 #endif // SLIT