From d843285db727a056d97efb42e3978281adc2fa0b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 8 Oct 2013 12:40:09 -0700
Subject: [PATCH] save profile to settings, fix UUID storage

---
 interface/src/DataServerClient.h | 2 +-
 interface/src/Menu.cpp           | 1 +
 interface/src/avatar/Profile.cpp | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/src/DataServerClient.h b/interface/src/DataServerClient.h
index fed956833d..1a26cdb23d 100644
--- a/interface/src/DataServerClient.h
+++ b/interface/src/DataServerClient.h
@@ -32,7 +32,7 @@ private:
 
 namespace DataServerKey {
     const char FaceMeshURL[] = "mesh";
-    const char UUID[] = "";
+    const char UUID[] = "uuid";
 }
 
 #endif /* defined(__hifi__DataServerClient__) */
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 74bfc0527a..0a20f8271a 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -527,6 +527,7 @@ void Menu::saveSettings(QSettings* settings) {
     
     scanMenuBar(&saveAction, settings);
     Application::getInstance()->getAvatar()->saveData(settings);
+    Application::getInstance()->getProfile()->saveData(settings);
     Application::getInstance()->getSwatch()->saveData(settings);
     
     // ask the NodeList to save its data
diff --git a/interface/src/avatar/Profile.cpp b/interface/src/avatar/Profile.cpp
index fcd4365c82..763e74fdd9 100644
--- a/interface/src/avatar/Profile.cpp
+++ b/interface/src/avatar/Profile.cpp
@@ -29,8 +29,10 @@ void Profile::setUsername(const QString &username) {
     this->clear();
     _username = username;
     
-    // we've been given a new username, ask the data-server for our UUID
-    DataServerClient::getClientValueForKey(DataServerKey::UUID);
+    if (!_username.isEmpty()) {
+        // we've been given a new username, ask the data-server for our UUID
+        DataServerClient::getClientValueForKey(DataServerKey::UUID);
+    }
 }
 
 void Profile::saveData(QSettings* settings) {