From 4de585f5b89532fa7d366389bc40072965ed4fab Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Mon, 3 Jan 2011 22:03:41 +0000
Subject: [PATCH] - bugfix for merging ini properties (missed a line of code)

---
 source/glest_game/global/config.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp
index 4d760e5f..d76345e8 100644
--- a/source/glest_game/global/config.cpp
+++ b/source/glest_game/global/config.cpp
@@ -413,6 +413,7 @@ vector<pair<string,string> > Config::getMergedProperties() const {
             pair<string,string> &property = result[j];
             // Take the user property and override the original value
             if(property.first == propertyUser.first) {
+                overrideProperty = true;
                 property.second = propertyUser.second;
                 break;
             }