[gnome-builder/gnome-builder-3-20] autotools: don't allow cancellation during communicate



commit 6cc0399aeafd70ca9486951cea756a621bfa311f
Author: Christian Hergert <chergert redhat com>
Date:   Wed May 11 14:36:10 2016 +0300

    autotools: don't allow cancellation during communicate
    
    We don't want to allow this to cancel, since it can cause really
    difficult cleanup procedure (since we are synchronous). This is also
    causing some nasty crashes when rapidly opening files at startup.

 plugins/autotools/ide-makecache.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/plugins/autotools/ide-makecache.c b/plugins/autotools/ide-makecache.c
index 032646c..67b5615 100644
--- a/plugins/autotools/ide-makecache.c
+++ b/plugins/autotools/ide-makecache.c
@@ -1050,7 +1050,8 @@ ide_makecache_get_file_flags_worker (GTask        *task,
           IDE_EXIT;
         }
 
-      if (!g_subprocess_communicate_utf8 (subprocess, NULL, cancellable, &stdoutstr, NULL, &error))
+      /* Don't let ourselves be cancelled from this operation */
+      if (!g_subprocess_communicate_utf8 (subprocess, NULL, NULL, &stdoutstr, NULL, &error))
         {
           g_assert (error != NULL);
           g_task_return_error (task, error);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]