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

automountManager: Explicitly track active operations

Browse Source 
As a mount operation's UI may be reused (for example after mistyping
the password), we only close the operation once the mount has finished
(successfully or with error).

We therefore need to track ongoing operations, which we currently do
by monkey-patching the corresponding volume object. However while the
underlying GVolume object indeed remains the same through-out the
operation, the JS wrapper object isn't referenced anywhere and may
thus be garbage collected, resulting in a stuck dialog.

Fix this issue by tracking active operations explicitly, so that all
involved objects are referenced until the end of the operation.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/565
This commit is contained in:
Florian Müllner 2018-10-05 19:09:28 +02:00 committed by Florian Müllner
parent 669582ddbb
commit e2f6a1980d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/components/automountManager.js
View File

@ -25,6 +25,7 @@ var AutomountManager = new Lang.Class({
_init() { _init() {
this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA }); this._settings = new Gio.Settings({ schema_id: SETTINGS_SCHEMA });
this._volumeQueue = []; this._volumeQueue = [];
this._activeOperations = new Map();
this._session = new GnomeSession.SessionManager(); this._session = new GnomeSession.SessionManager();
this._session.connectSignal('InhibitorAdded', this._session.connectSignal('InhibitorAdded',
this._InhibitorsChanged.bind(this)); this._InhibitorsChanged.bind(this));
@ -182,7 +183,7 @@ var AutomountManager = new Lang.Class({
this._allowAutorun(volume); this._allowAutorun(volume);
let mountOp = operation ? operation.mountOp : null; let mountOp = operation ? operation.mountOp : null;
volume._operation = operation; this._activeOperations.set(volume, operation);
volume.mount(0, mountOp, null, volume.mount(0, mountOp, null,
this._onVolumeMounted.bind(this)); this._onVolumeMounted.bind(this));
@ -219,7 +220,8 @@ var AutomountManager = new Lang.Class({
}, },
_reaskPassword(volume) { _reaskPassword(volume) {
let existingDialog = volume._operation ? volume._operation.borrowDialog() : null; let prevOperation = this._activeOperations.get(volume);
let existingDialog = prevOperation ? prevOperation.borrowDialog() : null;
let operation = let operation =
new ShellMountOperation.ShellMountOperation(volume, new ShellMountOperation.ShellMountOperation(volume,
{ existingDialog: existingDialog }); { existingDialog: existingDialog });
@ -227,8 +229,11 @@ var AutomountManager = new Lang.Class({
}, },
_closeOperation(volume) { _closeOperation(volume) {
if (volume._operation) let operation = this._activeOperations.get(volume);
volume._operation.close(); if (!operation)
return;
operation.close();
this._activeOperations.delete(volume);
}, },
_allowAutorun(volume) { _allowAutorun(volume) {