From 6f868a00eb91af67a5bcb0a4c79974f874d63674 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Oct 2013 16:34:35 -0700
Subject: [PATCH] reset environment on domain-server change

---
 interface/src/Application.cpp | 3 +++
 interface/src/Menu.cpp        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c052627fcc..a6b0a9fa97 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3525,6 +3525,9 @@ void Application::domainChanged(QString domain) {
     
     // update the user's last domain in their Profile (which will propagate to data-server)
     _profile.updateDomain(domain);
+    
+    // reset the environment so that we don't erroneously end up with multiple
+    _environment.resetToDefault();
 }
 
 void Application::nodeAdded(Node* node) {
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 98dbc983ff..15b0b64329 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -725,7 +725,7 @@ void updateDSHostname(const QString& domainServerHostname) {
         newHostname = domainServerHostname;
     }
     
-    // check if the domain server hostname is new
+    // give our nodeList the new domain-server hostname
     NodeList::getInstance()->setDomainHostname(newHostname);
 }