1 files changed, 5 insertions, 14 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 6126bdc5..6131ec49 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -347,6 +347,10 @@ BlackboxWindow::~BlackboxWindow(void) {
   if (flags.moving)
     endMove();
 
+  delete timer;
+
+  delete windowmenu;
+
   if (client.window_group) {
     BWindowGroup *group = blackbox->searchGroup(client.window_group);
     if (group) group->removeWindow(this);
@@ -357,18 +361,9 @@ BlackboxWindow::~BlackboxWindow(void) {
     if (client.transient_for != (BlackboxWindow *) ~0ul) {
       client.transient_for->client.transientList.remove(this);
     }
-    // we save our transient_for though because the workspace will use it
-    // when determining the next window to get focus
+    client.transient_for = (BlackboxWindow*) 0;
   }
 
-  if (blackbox_attrib.workspace != BSENTINEL &&
-      window_number != BSENTINEL)
-    screen->getWorkspace(blackbox_attrib.workspace)->removeWindow(this);
-  else if (flags.iconic)
-    screen->removeIcon(this);
-
-  client.transient_for = (BlackboxWindow*) 0;
-
   if (client.transientList.size() > 0) {
     // reset transient_for for all transients
     BlackboxWindowList::iterator it, end = client.transientList.end();
@@ -377,10 +372,6 @@ BlackboxWindow::~BlackboxWindow(void) {
     }
   }
 
-  delete timer;
-
-  delete windowmenu;
-
   if (frame.title)
     destroyTitlebar();