[gimp] app: fix gimp-parallel shutdown
- From: N/A <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: fix gimp-parallel shutdown
- Date: Sun, 13 May 2018 15:56:16 +0000 (UTC)
commit 4c767b4f03416df328954324a94ade4bbfc7c037
Author: Ell <ell_se yahoo com>
Date: Sun May 13 11:50:33 2018 -0400
app: fix gimp-parallel shutdown
Some leftover from an earlier version. Caused gimp_parallel_exit()
to hang, although we could only notice that in GIMP_UNSTABLE
builds.
app/core/gimp-parallel.cc | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/app/core/gimp-parallel.cc b/app/core/gimp-parallel.cc
index 29f5678..a9bab9c 100644
--- a/app/core/gimp-parallel.cc
+++ b/app/core/gimp-parallel.cc
@@ -97,7 +97,6 @@ static GimpParallelRunAsyncThread gimp_parallel_run_async_threads[GIMP_PARALLE
static GMutex gimp_parallel_run_async_mutex;
static GCond gimp_parallel_run_async_cond;
static GQueue gimp_parallel_run_async_queue = G_QUEUE_INIT;
-static gboolean gimp_parallel_run_async_quit;
static gint gimp_parallel_distribute_n_threads = 1;
static GimpParallelDistributeThread gimp_parallel_distribute_threads[GIMP_PARALLEL_DISTRIBUTE_MAX_THREADS -
1];
@@ -403,10 +402,8 @@ gimp_parallel_run_async_thread_func (GimpParallelRunAsyncThread *thread)
{
GimpParallelRunAsyncTask *task;
- if (gimp_parallel_run_async_quit)
- {
- break;
- }
+ if (thread->quit)
+ break;
while ((task = (GimpParallelRunAsyncTask *) g_queue_pop_head (&gimp_parallel_run_async_queue)))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]