summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/workspace.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 36eb62b4..1bdfbcfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-08 Elijah Newren <newren@gmail.com>
+
+ Fix a crash that occurs when removing some virtual desktops and
+ windows happen to be on those desktops. #318306.
+
+ * src/workspace.c (meta_workspace_relocate_windows): Since windows
+ cannot be on more than one workspace at a time, remove the window
+ from the old workspace before adding it to the new one.
+
2005-10-03 Elijah Newren <newren@gmail.com>
A combination of a couple memory leaks fixes, from Kjartan,
diff --git a/src/workspace.c b/src/workspace.c
index 6c158366..1769c340 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -236,8 +236,8 @@ meta_workspace_relocate_windows (MetaWorkspace *workspace,
{
MetaWindow *window = tmp->data;
- meta_workspace_add_window (new_home, window);
meta_workspace_remove_window (workspace, window);
+ meta_workspace_add_window (new_home, window);
tmp = tmp->next;
}