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

gdm: Don't try answering query if the user verifier has been deleted

Browse Source 
Answering a query may be delayed to the moment in which we've not any
more messages in the queue, however this case can also happen just after
we've cleared the UserVerifier and in such case we'd have nothing to
answer, but we currently throw an error:

    JS ERROR: Exception in callback for signal: no-more-messages:
      TypeError: this._userVerifier is null
    answerQuery/signalId<@resource:///org/gnome/shell/gdm/util.js:249:17
    _emit@resource:///org/gnome/gjs/modules/core/_signals.js:133:47
    finishMessageQueue@resource:///org/gnome/shell/gdm/util.js:266:14
    _clearMessageQueue@resource:///org/gnome/shell/gdm/util.js:301:14
    clear@resource:///org/gnome/shell/gdm/util.js:223:14
    cancel@resource:///org/gnome/shell/gdm/util.js:205:18
    reset@resource:///org/gnome/shell/gdm/authPrompt.js:482:32
    cancel@resource:///org/gnome/shell/gdm/authPrompt.js:569:14
    vfunc_key_press_event@resource:///org/gnome/shell/gdm/authPrompt.js:128

So handle this case more gracefully keeping track of the current
cancellable and checking whether it is still valid before trying to answer
a query or do a delayed action.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1622>
This commit is contained in:
Marco Trevisan (Treviño) 2021-02-01 16:42:21 +01:00 committed by Marge Bot
parent c8bb45b41c
commit c936ca3ea0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/gdm/util.js
View File

@ -260,9 +260,11 @@ var ShellUserVerifier = class {
if (!this.hasPendingMessages) { if (!this.hasPendingMessages) {
this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
} else { } else {
const cancellable = this._cancellable;
let signalId = this.connect('no-more-messages', () => { let signalId = this.connect('no-more-messages', () => {
this.disconnect(signalId); this.disconnect(signalId);
this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); if (!cancellable.is_cancelled())
this._userVerifier.call_answer_query(serviceName, answer, cancellable, null);
}); });
} }
} }
@ -583,9 +585,10 @@ var ShellUserVerifier = class {
if (!this.hasPendingMessages) { if (!this.hasPendingMessages) {
this._retry(); this._retry();
} else { } else {
const cancellable = this._cancellable;
let signalId = this.connect('no-more-messages', () => { let signalId = this.connect('no-more-messages', () => {
this.disconnect(signalId); this.disconnect(signalId);
if (this._cancellable && !this._cancellable.is_cancelled()) if (!cancellable.is_cancelled())
this._retry(); this._retry();
}); });
} }
@ -594,9 +597,11 @@ var ShellUserVerifier = class {
if (!this.hasPendingMessages) { if (!this.hasPendingMessages) {
this._cancelAndReset(); this._cancelAndReset();
} else { } else {
const cancellable = this._cancellable;
let signalId = this.connect('no-more-messages', () => { let signalId = this.connect('no-more-messages', () => {
this.disconnect(signalId); this.disconnect(signalId);
this._cancelAndReset(); if (!cancellable.is_cancelled())
this._cancelAndReset();
}); });
} }
} }