Only merge when merging

mami-project · Oct 18, 2016 · 66d2c59 · 66d2c59
1 parent b771c9c
commit 66d2c59
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pathspider/base.py b/pathspider/base.py
@@ -313,7 +313,7 @@ def merger(self):
             #         logger.debug("worker %3u: %s" % (wn, self._worker_state[wn]))
             # merge_cycles += 1
 
-            if self.flowqueue.qsize() >= self.resqueue.qsize():
+            if merging_flows and self.flowqueue.qsize() >= self.resqueue.qsize():
                 try:
                     flow = self.flowqueue.get_nowait()
                 except queue.Empty:
@@ -346,7 +346,7 @@ def merger(self):
                             except KeyError:
                                 pass
 
-            else:
+            else if merging_results:
                 try:
                     res = self.resqueue.get_nowait()
                 except queue.Empty: