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

screenshot: Handle window screenshot failures gracefully

Browse Source 
meta_window_actor_get_image() may return NULL. Instead of crashing,
catch that case and return a proper error.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3258
This commit is contained in:
Florian Müllner 2020-10-18 16:01:05 +02:00
parent 6273654376
commit d72da7d246
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shell-screenshot.c
View File

@ -295,6 +295,15 @@ grab_window_screenshot (ShellScreenshot *screenshot,
priv->image = meta_window_actor_get_image (META_WINDOW_ACTOR (window_actor), priv->image = meta_window_actor_get_image (META_WINDOW_ACTOR (window_actor),
NULL); NULL);
if (!priv->image)
{
g_task_report_new_error (screenshot, on_screenshot_written, result, NULL,
G_IO_ERROR, G_IO_ERROR_FAILED,
"Capturing window failed");
return;
}
priv->datetime = g_date_time_new_now_local (); priv->datetime = g_date_time_new_now_local ();
if (flags & SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR) if (flags & SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR)