[gnome-builder] threading: use task cancellation path upon IdeObject destruction
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] threading: use task cancellation path upon IdeObject destruction
- Date: Fri, 11 Jan 2019 19:26:32 +0000 (UTC)
commit 09bf85affbd1235f29eedc18361c90972090c676
Author: Christian Hergert <chergert redhat com>
Date: Fri Jan 11 11:26:13 2019 -0800
threading: use task cancellation path upon IdeObject destruction
src/libide/threading/ide-task.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/src/libide/threading/ide-task.c b/src/libide/threading/ide-task.c
index f32ebc460..78ea7f76a 100644
--- a/src/libide/threading/ide-task.c
+++ b/src/libide/threading/ide-task.c
@@ -1547,7 +1547,9 @@ ide_task_propagate_locked (IdeTask *self,
*error = g_error_copy (priv->result->u.v_error);
}
else if ((priv->check_cancellable && g_cancellable_is_cancelled (priv->cancellable)) ||
- priv->result->type == IDE_TASK_RESULT_CANCELLED)
+ priv->result->type == IDE_TASK_RESULT_CANCELLED ||
+ (IDE_IS_OBJECT (priv->source_object) &&
+ ide_object_in_destruction (IDE_OBJECT (priv->source_object))))
{
g_set_error (error,
G_IO_ERROR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]