summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/screen.c28
2 files changed, 20 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 27542eb..c132184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-15 Elijah Newren <newren gmail com>
+
+ * src/screen.c (reload_xinerama_infos): Patch from
+ jylefort@FreeBSD.org to prevent a crash when changing resolution.
+ Fixes #340847.
+
2006-05-15 Björn Lindqvist <bjourne@gmail.com>
* places.[ch] (intcmp, window_get_edges,
diff --git a/src/screen.c b/src/screen.c
index bde2f7f..9f369a5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -187,6 +187,20 @@ reload_xinerama_infos (MetaScreen *screen)
{
MetaDisplay *display;
+ {
+ GList *tmp;
+
+ tmp = screen->workspaces;
+ while (tmp != NULL)
+ {
+ MetaWorkspace *space = tmp->data;
+
+ meta_workspace_invalidate_work_area (space);
+
+ tmp = tmp->next;
+ }
+ }
+
display = screen->display;
if (screen->xinerama_infos)
@@ -348,20 +362,6 @@ reload_xinerama_infos (MetaScreen *screen)
g_assert (screen->n_xinerama_infos > 0);
g_assert (screen->xinerama_infos != NULL);
-
- {
- GList *tmp;
-
- tmp = screen->workspaces;
- while (tmp != NULL)
- {
- MetaWorkspace *space = tmp->data;
-
- meta_workspace_invalidate_work_area (space);
-
- tmp = tmp->next;
- }
- }
}
MetaScreen*