From e44b0af9b6f2f74c937bd79083dd943084306735 Mon Sep 17 00:00:00 2001 From: Don Park Date: Fri, 25 Oct 2013 11:36:50 -0700 Subject: [PATCH] make updateWindowTitle public, call it after Menu loads data into the Profile --- interface/src/Application.h | 3 ++- interface/src/Menu.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index 3333de3d7a..fb258f0353 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -109,6 +109,8 @@ public: void touchEndEvent(QTouchEvent* event); void touchUpdateEvent(QTouchEvent* event); + void updateWindowTitle(); + void wheelEvent(QWheelEvent* event); const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel); @@ -206,7 +208,6 @@ private: void initDisplay(); void init(); - void updateWindowTitle(); void update(float deltaTime); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 1775c250f1..a31ff61ae8 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -532,6 +532,7 @@ void Menu::loadSettings(QSettings* settings) { Application::getInstance()->getAvatar()->loadData(settings); Application::getInstance()->getSwatch()->loadData(settings); Application::getInstance()->getProfile()->loadData(settings); + Application::getInstance()->updateWindowTitle(); NodeList::getInstance()->loadData(settings); }