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.

diff --git a/src/Screen.cc b/src/Screen.cc
index 313aeb21e8efa2c9a053832334f2d47298b50759..4f4718ec1a4eab95b4f57cd2f4ca55d525cf61f3 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1402,8 +1402,13 @@ void BScreen::removeWorkspaceNames(void) {
 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,

diff --git a/src/Window.cc b/src/Window.cc
index c2e8644b9c7b8d5b6a327bc0ea7951d4d99e4b40..56487e0bd99c2674394bdae38f26993810b4d86a 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -168,9 +168,8 @@ OpenboxWindow::OpenboxWindow(Openbox &o, Window w, BScreen *s) : openbox(o) {
 #ifdef    SLIT
   if (client.initial_state == WithdrawnState) {
     screen->getSlit()->addClient(client.window);
-    delete this;
-
     openbox.ungrab();
+    delete this;
     return;
   }
 #endif // SLIT