From 1cbcba202cad6fe76cecb1a1d666e72b091ba868 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 31 Jul 2012 19:05:03 +0200 Subject: [PATCH] Changed: #1440 Nicely handle abort button hammering --HG-- branch : build_pipeline_v3 --- .../tools/pipeline/service/module_pipeline_master.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/nel/tools/pipeline/service/module_pipeline_master.cpp b/code/nel/tools/pipeline/service/module_pipeline_master.cpp index e57f7b01f..d0d5933f7 100644 --- a/code/nel/tools/pipeline/service/module_pipeline_master.cpp +++ b/code/nel/tools/pipeline/service/module_pipeline_master.cpp @@ -637,9 +637,14 @@ public: { if (m_BuildWorking) { - m_AbortRequested = true; - CInfoFlags::getInstance()->addFlag(PIPELINE_INFO_ABORTING); + if (!m_AbortRequested) + { + m_AbortRequested = true; + CInfoFlags::getInstance()->addFlag(PIPELINE_INFO_ABORTING); + } + // Yes, we effectively send the abort again to the slaves, it makes for a more epic abort button hammering experience. + m_BuildTaskQueue.abortQueue(); m_SlavesMutex.lock();