[GRASS-SVN] r67532 - grass/trunk/gui/wxpython/datacatalog

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Jan 9 19:06:14 PST 2016


Author: annakrat
Date: 2016-01-09 19:06:13 -0800 (Sat, 09 Jan 2016)
New Revision: 67532

Modified:
   grass/trunk/gui/wxpython/datacatalog/tree.py
Log:
wxGUI/datacatalog: fix deadlock, see #2697

Modified: grass/trunk/gui/wxpython/datacatalog/tree.py
===================================================================
--- grass/trunk/gui/wxpython/datacatalog/tree.py	2016-01-09 17:23:36 UTC (rev 67531)
+++ grass/trunk/gui/wxpython/datacatalog/tree.py	2016-01-10 03:06:13 UTC (rev 67532)
@@ -166,8 +166,8 @@
             if proc_count == nprocs or loc_count == nlocations:
                 Debug.msg(4, "Process subresults")
                 for i in range(len(loc_list)):
-                    proc_list[i].join(0.1)
                     maps, error = queue_list[i].get()
+                    proc_list[i].join()
                     if error:
                         errors.append(error)
                     for key in sorted(maps.keys()):



More information about the grass-commit mailing list