isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellApp: Avoid crashing during state transition for window-backed apps

Browse Source 
During a state transition from running to not-running for
window-backend apps, it's possible we get a request for the icon.
Avoid asserting here and just return an empty image.

https://bugzilla.gnome.org/show_bug.cgi?id=656546
This commit is contained in:
Colin Walters 2011-08-23 12:03:56 -04:00
parent 712ea9b9b6
commit fa0268f35a
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/shell-app.c
View File

@ -133,8 +133,22 @@ static ClutterActor *
window_backed_app_get_icon (ShellApp *app, window_backed_app_get_icon (ShellApp *app,
int size) int size)
{ {
MetaWindow *window = window_backed_app_get_window (app); MetaWindow *window;
ClutterActor *actor = st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (), ClutterActor *actor;
/* During a state transition from running to not-running for
* window-backend apps, it's possible we get a request for the icon.
* Avoid asserting here and just return an empty image.
*/
if (app->running_state == NULL)
{
actor = clutter_texture_new ();
g_object_set (actor, "opacity", 0, "width", (float) size, "height", (float) size, NULL);
return actor;
}
window = window_backed_app_get_window (app);
actor = st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
G_OBJECT (window), G_OBJECT (window),
"icon"); "icon");
g_object_set (actor, "width", (float) size, "height", (float) size, NULL); g_object_set (actor, "width", (float) size, "height", (float) size, NULL);