luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-31 06:13:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

GWin32AppInfo: Check for task cancellation

Browse Source 
We cannot cancel a spawn operation, but sometimes we have to
spawn the target application mutiple times (e.g. in case the
target app only supports one URI in its command-line, but we
were given multiple URI's), in that case continuously check
the cancellation status before attempting any spawn operation
This commit is contained in:
Luca Bacci
2022-08-12 19:08:38 +02:00
parent cff3e660c1
commit 42a76e1631
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gwin32appinfo.c
View File

@@ -5110,6 +5110,9 @@ g_win32_app_info_launch_internal (GWin32AppInfo *info,
do do
{ {
if (from_task && g_task_return_error_if_cancelled (from_task))
goto out;
if (!expand_application_parameters (info, if (!expand_application_parameters (info,
command, command,
&objs, &objs,
@@ -5403,7 +5406,7 @@ launch_uris_async_thread (GTask *task,
succeeded = g_win32_app_info_launch_uris_impl (appinfo, data->uris, data->context, task, &local_error); succeeded = g_win32_app_info_launch_uris_impl (appinfo, data->uris, data->context, task, &local_error);
if (succeeded) if (succeeded)
g_task_return_boolean (task, TRUE); g_task_return_boolean (task, TRUE);
else else if (!g_task_had_error (task))
g_task_return_error (task, g_steal_pointer (&local_error)); g_task_return_error (task, g_steal_pointer (&local_error));
} }