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

workspaceThumbnail: always destroy bgManager when destroyed

Browse Source 
Right now we only destroy the bgManager object when the
workspaceThumbnail is explicitly destroy with its destroy()
method.

This commit makes sure bgManager gets destroyed when the
workspaceThumbnail actor is destroyed without calling
destroy().

https://bugzilla.gnome.org/show_bug.cgi?id=696157
This commit is contained in:
Ray Strode 2013-03-25 11:31:56 -04:00
parent f920fd8b6f
commit 18d850d7d6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/workspaceThumbnail.js
View File

@ -384,9 +384,8 @@ const WorkspaceThumbnail = new Lang.Class({
}, },
destroy : function() { destroy : function() {
this.actor.destroy(); if (this.actor)
this._bgManager.destroy(); this.actor.destroy();
this._bgManager = null;
}, },
workspaceRemoved : function() { workspaceRemoved : function() {
@ -407,6 +406,11 @@ const WorkspaceThumbnail = new Lang.Class({
_onDestroy: function(actor) { _onDestroy: function(actor) {
this.workspaceRemoved(); this.workspaceRemoved();
if (this._bgManager) {
this._bgManager.destroy();
this._bgManager = null;
}
this._windows = []; this._windows = [];
this.actor = null; this.actor = null;
}, },