diff options
author | Elijah Newren <newren gmail com> | 2006-05-15 18:37:36 +0000 |
---|---|---|
committer | Elijah Newren <newren@src.gnome.org> | 2006-05-15 18:37:36 +0000 |
commit | 3cb72d338c1b0f376f2429d75fc886f841f1a833 (patch) | |
tree | 9178d51cd283fae820a03c829740db66f7feab81 | |
parent | 51ade19ae9837025c8b5da5410827bf23bb92851 (diff) | |
download | metacity-3cb72d338c1b0f376f2429d75fc886f841f1a833.tar.gz |
Patch from jylefort@FreeBSD.org to prevent a crash when changing
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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/screen.c | 28 |
2 files changed, 20 insertions, 14 deletions
@@ -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 bde2f7f9..9f369a56 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* |