History

Merge branch 'master' of https://github.com/worklist/hifi into 19597

Stojce Slavkovski committed 12 years ago

Commit ca2c8d22 parents 029e20e 4c84d2e4 files · +88 −50Browse files

Showing the changes to interface/src/Menu.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Menu.cpp+6−6
@@ -907,7 +907,12 @@ void Menu::goTo() { · 906 unmodified lines
907907 if (desiredDestination.startsWith(CUSTOM_URL_SCHEME + "//")) {
908908 QStringList urlParts = desiredDestination.remove(0, CUSTOM_URL_SCHEME.length() + 2).split('/', QString::SkipEmptyParts);
909909
910− if (urlParts.count() > 1) {
910+ if (urlParts.count() == 1) {
911+ // location coordinates or place name
912+ QString domain = urlParts[0];
913+ goToDomain(domain);
914+ }
915+ else if (urlParts.count() > 1) {
911916 // if url has 2 or more parts, the first one is domain name
912917 QString domain = urlParts[0];
913918
@@ -928,12 +933,7 @@ void Menu::goTo() { · 14 unmodified lines
928933 // location orientation
929934 goToOrientation(orientation);
930935 }
931− } else if (urlParts.count() == 1) {
932− // location coordinates or place name
933− QString destination = urlParts[0];
934− goTo(destination);
935936 }
936−
937937 } else {
938938 goToUser(gotoDialog.textValue());
939939 }