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

screenshot: Return error when stream creation fails

Browse Source 
The Shell.Screenshot API expects valid output streams for writing the
completed screenshot, not NULL.

Handle this properly by returning an error instead of passing it on
to the screenshot.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1123
This commit is contained in:
Florian Müllner 2020-03-24 07:44:31 +01:00 committed by Carlos Garnacho
parent 23e5cd4e10
commit eb51942a05
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/screenshot.js
View File

@ -84,7 +84,7 @@ var ScreenshotService = class {
}
}
_createStream(filename) {
_createStream(filename, invocation) {
if (filename == '')
return [Gio.MemoryOutputStream.new_resizable(), null];
@ -94,6 +94,7 @@ var ScreenshotService = class {
let stream = file.replace(null, false, Gio.FileCreateFlags.NONE, null);
return [stream, file];
} catch (e) {
invocation.return_value(GLib.Variant.new('(bs)', [false, '']));
return [null, null];
}
}
@ -104,10 +105,11 @@ var ScreenshotService = class {
return [stream, file];
} catch (e) {
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
return [null, null];
break;
}
}
invocation.return_value(GLib.Variant.new('(bs)', [false, '']));
return [null, null];
}
@ -169,7 +171,9 @@ var ScreenshotService = class {
if (!screenshot)
return;
let [stream, file] = this._createStream(filename);
let [stream, file] = this._createStream(filename, invocation);
if (!stream)
return;
screenshot.screenshot_area(x, y, width, height, stream,
(o, res) => {
@ -190,7 +194,9 @@ var ScreenshotService = class {
if (!screenshot)
return;
let [stream, file] = this._createStream(filename);
let [stream, file] = this._createStream(filename, invocation);
if (!stream)
return;
screenshot.screenshot_window(includeFrame, includeCursor, stream,
(o, res) => {
@ -211,7 +217,9 @@ var ScreenshotService = class {
if (!screenshot)
return;
let [stream, file] = this._createStream(filename);
let [stream, file] = this._createStream(filename, invocation);
if (!stream)
return;
screenshot.screenshot(includeCursor, stream,
(o, res) => {