Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all
Unified · Split
| @@ -165,6 +165,8 @@ Menu::Menu() : · 164 unmodified lines | ||
| 165 | 165 | Qt::Key_At, |
| 166 | 166 | this, |
| 167 | 167 | SLOT(goTo())); |
| 168 | + connect(&LocationManager::getInstance(), &LocationManager::multipleDestinationsFound, | |
| 169 | + this, &Menu::multipleDestinationsDecision); | |
| 168 | 170 | |
| 169 | 171 | addDisabledActionAndSeparator(fileMenu, "Upload Avatar Model"); |
| 170 | 172 | addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0, Application::getInstance(), SLOT(uploadHead())); |
| @@ -1002,9 +1004,7 @@ bool Menu::goToDestination(QString destination) { · 831 unmodified lines | ||
| 1002 | 1004 | } |
| 1003 | 1005 | |
| 1004 | 1006 | void Menu::goTo(QString destination) { |
| 1005 | − LocationManager* manager = &LocationManager::getInstance(); | |
| 1006 | − manager->goTo(destination); | |
| 1007 | − connect(manager, &LocationManager::multipleDestinationsFound, getInstance(), &Menu::multipleDestinationsDecision); | |
| 1007 | + LocationManager::getInstance().goTo(destination); | |
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | void Menu::goTo() { |