浏览代码

wxGUI/datacatalog: fix deadlock, see https://trac.osgeo.org/grass/ticket/2697

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67532 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 9 年之前
父节点
当前提交
74bd66fdb0
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      gui/wxpython/datacatalog/tree.py

+ 1 - 1
gui/wxpython/datacatalog/tree.py

@@ -166,8 +166,8 @@ class LocationMapTree(TreeView):
             if proc_count == nprocs or loc_count == nlocations:
             if proc_count == nprocs or loc_count == nlocations:
                 Debug.msg(4, "Process subresults")
                 Debug.msg(4, "Process subresults")
                 for i in range(len(loc_list)):
                 for i in range(len(loc_list)):
-                    proc_list[i].join(0.1)
                     maps, error = queue_list[i].get()
                     maps, error = queue_list[i].get()
+                    proc_list[i].join()
                     if error:
                     if error:
                         errors.append(error)
                         errors.append(error)
                     for key in sorted(maps.keys()):
                     for key in sorted(maps.keys()):