From 978b7521dba30fb90e5eb39a2a5075dcd9fcd1ff Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 16 Jun 2014 11:30:47 -0700 Subject: [PATCH] Move connect call for multiple destinations to constructor --- interface/src/Menu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 46b2bfc806..8f023e607f 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -165,6 +165,8 @@ Menu::Menu() : Qt::Key_At, this, SLOT(goTo())); + connect(&LocationManager::getInstance(), &LocationManager::multipleDestinationsFound, + this, &Menu::multipleDestinationsDecision); addDisabledActionAndSeparator(fileMenu, "Upload Avatar Model"); addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0, Application::getInstance(), SLOT(uploadHead())); @@ -1002,9 +1004,7 @@ bool Menu::goToDestination(QString destination) { } void Menu::goTo(QString destination) { - LocationManager* manager = &LocationManager::getInstance(); - manager->goTo(destination); - connect(manager, &LocationManager::multipleDestinationsFound, getInstance(), &Menu::multipleDestinationsDecision); + LocationManager::getInstance().goTo(destination); } void Menu::goTo() {