]> www.fi.muni.cz Git - evince.git/commitdiff
[shell] Make sure we have a proxy before using it in ev-media-player-keys
authorCarlos Garcia Campos <carlosgc@gnome.org>
Tue, 25 May 2010 10:31:29 +0000 (12:31 +0200)
committerCarlos Garcia Campos <carlosgc@gnome.org>
Tue, 25 May 2010 10:31:29 +0000 (12:31 +0200)
shell/ev-media-player-keys.c

index c8f3418bc45bb75eb3552752030deab6d9b249a2..efc32dcb3c13fe84421a217b337049e94a0aa9f3 100644 (file)
@@ -189,13 +189,13 @@ ev_media_player_keys_finalize (GObject *object)
 {
        EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object);
 
-        ev_media_player_keys_release_keys (keys);
-
        if (keys->watch_id > 0)
                g_bus_unwatch_proxy (keys->watch_id);
 
-        if (keys->proxy != NULL)
+        if (keys->proxy != NULL) {
+               ev_media_player_keys_release_keys (keys);
                 g_object_unref (keys->proxy);
+       }
 
        G_OBJECT_CLASS (ev_media_player_keys_parent_class)->finalize (object);
 }