[Wesnoth-commits] r9958 - /trunk/src/config.cpp (February 04, 2006 - 00:52)

Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Headers

 

Author: xan
Date: Sat Feb  4 00:51:48 2006
New Revision: 9958

URL: http://svn.gna.org/viewcvs/wesnoth?rev=9958&view=rev
Log:
Fixed config::merge_with.

Modified:
    trunk/src/config.cpp

Modified: trunk/src/config.cpp
URL: http://svn.gna.org/viewcvs/wesnoth/trunk/src/config.cpp?rev=9958&r1=9957&r2=9958&view=diff
==============================================================================
--- trunk/src/config.cpp (original)
+++ trunk/src/config.cpp Sat Feb  4 00:51:48 2006
@@ -550,7 +550,7 @@
 
 			const child_map::iterator itor = n.children.find(i->first);
 			//const child_map::iterator itor = children.find(*item.first);
-			if(itor == children.end() || index >= itor->second.size()) {
+			if(itor == n.children.end() || index >= itor->second.size()) {
 				throw error("error in merge_with: could not find element '" + i->first + "'");
 			}
 



Related Mails




Powered by MHonArc, Updated Sat Feb 04 12:40:14 2006