From 28ad80936aadd2b29072e7ead391395567225536 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 28 Apr 2015 13:21:14 -0700
Subject: [PATCH] assignment-client shouldn't try to save contents of its
 nonexistent address bar.  interface still needs to save the address.

---
 interface/src/Application.cpp               | 1 +
 libraries/networking/src/AddressManager.cpp | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 68a542d4dd..1e3e6cfd9e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -465,6 +465,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     addressManager->setOrientationGetter(getOrientationForPath);
     
     connect(addressManager.data(), &AddressManager::rootPlaceNameChanged, this, &Application::updateWindowTitle);
+    connect(this, &QCoreApplication::aboutToQuit, addressManager.data(), &AddressManager::storeCurrentAddress);
 
     #ifdef _WIN32
     WSADATA WsaData;
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 73aaa63844..9b99c236b3 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -35,7 +35,6 @@ AddressManager::AddressManager() :
     _positionGetter(NULL),
     _orientationGetter(NULL)
 {
-    connect(qApp, &QCoreApplication::aboutToQuit, this, &AddressManager::storeCurrentAddress);
 }
 
 bool AddressManager::isConnected() {