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

LayoutManager: untrack actors that are destroyed

Browse Source 
If an actor is destroyed, calling get_transformed_size()/position()
can return bogus values and trigger JS exceptions.
This can happen if a tracked actor comes from an extension
(such as classic mode's window-list) and that extension is
deactivated.

https://bugzilla.gnome.org/show_bug.cgi?id=723661
This commit is contained in:
Giovanni Campagna 2014-02-08 21:44:58 +01:00
parent 96ef0a178d
commit 477f28a6bd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/ui/layout.js
View File

@ -834,6 +834,8 @@ const LayoutManager = new Lang.Class({
Lang.bind(this, this._queueUpdateRegions)); Lang.bind(this, this._queueUpdateRegions));
actorData.allocationId = actor.connect('notify::allocation', actorData.allocationId = actor.connect('notify::allocation',
Lang.bind(this, this._queueUpdateRegions)); Lang.bind(this, this._queueUpdateRegions));
actorData.destroyId = actor.connect('destroy',
Lang.bind(this, this._untrackActor));
// Note that destroying actor will unset its parent, so we don't // Note that destroying actor will unset its parent, so we don't
// need to connect to 'destroy' too. // need to connect to 'destroy' too.
@ -852,6 +854,7 @@ const LayoutManager = new Lang.Class({
actor.disconnect(actorData.visibleId); actor.disconnect(actorData.visibleId);
actor.disconnect(actorData.allocationId); actor.disconnect(actorData.allocationId);
actor.disconnect(actorData.parentSetId); actor.disconnect(actorData.parentSetId);
actor.disconnect(actorData.destroyId);
this._queueUpdateRegions(); this._queueUpdateRegions();
}, },