brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Fix meta_window_get_workspaces when a window isn't on a workspace

Browse Source 
Since we're going to be evaluating the work area at startup now, we need
to make sure that we don't iterate over workspaces before they're assigned.
The easiest way to do this is to make sure that meta_window_get_workspaces
doesn't crash.

https://bugzilla.gnome.org/show_bug.cgi?id=643606
This commit is contained in:
Jasper St. Pierre 2012-03-13 00:37:31 -04:00
parent 6dfde43786
commit 578b1c06c7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/window.c
View File

@ -7475,8 +7475,10 @@ meta_window_get_workspaces (MetaWindow *window)
{ {
if (window->on_all_workspaces) if (window->on_all_workspaces)
return window->screen->workspaces; return window->screen->workspaces;
else else if (window->workspace != NULL)
return window->workspace->list_containing_self; return window->workspace->list_containing_self;
else
return NULL;
} }
static void static void