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

screenshot: Return error if stream creation failed

Browse Source 
When we fail for some reason to open a stream to write the screenshot
to, we currently return `false` to the sender. That's not wrong, but
doesn't provide any hints on what caused the failure, so return the
underlying error instead.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3618

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1589>
This commit is contained in:
Florian Müllner 2021-01-25 12:32:26 +01:00 committed by Marge Bot
parent 1aee0516d6
commit 0efa82acf0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/screenshot.js
View File

@ -108,22 +108,24 @@ var ScreenshotService = class {
let stream = file.replace(null, false, Gio.FileCreateFlags.NONE, null); let stream = file.replace(null, false, Gio.FileCreateFlags.NONE, null);
return [stream, file]; return [stream, file];
} catch (e) { } catch (e) {
invocation.return_value(GLib.Variant.new('(bs)', [false, ''])); invocation.return_gerror(e);
return [null, null]; return [null, null];
} }
} }
let err;
for (let file of this._resolveRelativeFilename(filename)) { for (let file of this._resolveRelativeFilename(filename)) {
try { try {
let stream = file.create(Gio.FileCreateFlags.NONE, null); let stream = file.create(Gio.FileCreateFlags.NONE, null);
return [stream, file]; return [stream, file];
} catch (e) { } catch (e) {
err = e;
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS)) if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
break; break;
} }
} }
invocation.return_value(GLib.Variant.new('(bs)', [false, ''])); invocation.return_gerror(err);
return [null, null]; return [null, null];
} }