Bug 1118974 - Toolbox fails to shut down when highlighter actor is gone. r=pbrosset

This commit is contained in:
J. Ryan Stinnett 2015-01-26 14:38:00 +01:00
Родитель c7c2a73eb0
Коммит 59c1f8357f
1 изменённых файлов: 5 добавлений и 1 удалений

Просмотреть файл

@ -1294,9 +1294,13 @@ MarkupView.prototype = {
return this._destroyer;
}
this._destroyer = promise.resolve();
// Note that if the toolbox is closed, this will work fine, but will fail
// in case the browser is closed and will trigger a noSuchActor message.
this._destroyer = this._hideBoxModel();
// We ignore the promise that |_hideBoxModel| returns, since we should still
// proceed with the rest of destruction if it fails.
this._hideBoxModel();
this._elt.removeEventListener("click", this._onMouseClick, false);