From a97cfbd2ebeaf8e39cef6802deb3139569505288 Mon Sep 17 00:00:00 2001
From: Subv <s.v.h21@hotmail.com>
Date: Sun, 26 Aug 2012 18:14:58 -0500
Subject: Core/MMaps: Fixed infinite wait in the generator

---
 src/tools/mmaps_generator/MapBuilder.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index b04300994f9..8cdbdf61909 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -194,12 +194,13 @@ namespace MMAP
                     buildMap(mapID);
             }
         }
-        // Wait for all threads to finish before closing down
-        ACE_Thread_Manager::instance()->wait();
 
         // Free memory
         for (std::vector<BuilderThread*>::iterator _th = _threads.begin(); _th != _threads.end(); ++_th)
+        {
+            _th->wait();
             delete *_th;
+        }
     }
 
     /**************************************************************************/
-- 
cgit v1.2.3