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

NetworkMenu: don't queue menu updates for destroyed devices

Browse Source 
It will cause an exception as the work ID is now invalid, and may block
new devices from appearing for example when NM is restarted.

https://bugzilla.gnome.org/show_bug.cgi?id=684279
This commit is contained in:
Giovanni Campagna
2012-10-03 23:38:35 +02:00
parent 0e636ea67e
commit d583c48992
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/status/network.js
View File

@ -357,6 +357,12 @@ const NMDevice = new Lang.Class({
this._firmwareChangedId = 0;
}
if (this._deferredWorkId) {
// Just clear out, the actual removal is handled when the
// actor is destroyed
this._deferredWorkId = 0;
}
this._clearSection();
if (this.statusItem)
this.statusItem.destroy();
@ -490,8 +496,10 @@ const NMDevice = new Lang.Class({
},
_queueCreateSection: function() {
this._clearSection();
Main.queueDeferredWork(this._deferredWorkId);
if (this._deferredWorkId) {
this._clearSection();
Main.queueDeferredWork(this._deferredWorkId);
}
},
_clearSection: function() {