Merge pull request Mudlet#245 from SlySven/fix_clearAreaNamesMapAtSta…

…rtOfReloading Fix: Empty TRoomDB::areaNamesMap before (re)loading it from file
EldFitheach · Jan 22, 2015 · 5285831 · 5285831
2 parents be9bcff + 20cbc9c
commit 5285831
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/TRoomDB.cpp b/src/TRoomDB.cpp
@@ -439,6 +439,8 @@ void TRoomDB::restoreAreaMap( QDataStream & ifs )
 {
     QMap<int, QString> areaNamesMapWithPossibleEmptyOrDuplicateItems;
     ifs >> areaNamesMapWithPossibleEmptyOrDuplicateItems;
+    areaNamesMap.clear(); // Following code assumes areaNamesMap is empty but
+                          // under some situations this has not been the case...
 
     // Validate names: name nameless areas and rename duplicates
     QMultiMap<QString, QString> renamedMap; // For warning message, holds renamed area map