From 5d9f62066a31ac787bced47dad231432823882d4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 21 May 2015 10:27:22 -0700
Subject: [PATCH] reload the merged config after making versioned changes

---
 domain-server/src/DomainServerSettingsManager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index c0d85687bb..5cd5b5ef35 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -104,6 +104,9 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
 
                 // write the new settings to the json file
                 persistToFile();
+
+                // reload the master and user config so that the merged config is right
+                _configMap.loadMasterAndUserConfig(argumentList);
             }
         }
     }