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

         if (desiredDestination.startsWith(CUSTOM_URL_SCHEME + "//")) {
             QStringList urlParts = desiredDestination.remove(0, CUSTOM_URL_SCHEME.length() + 2).split('/', QString::SkipEmptyParts);
-            if (urlParts.count() > 1) {
+            if (urlParts.count() == 1) {
+                // location coordinates or place name
+                QString domain = urlParts[0];
+                goToDomain(domain);
+            }
+            else if (urlParts.count() > 1) {
                 // if url has 2 or more parts, the first one is domain name
                 QString domain = urlParts[0];
                     // location orientation
                     goToOrientation(orientation);
                 }
-            } else if (urlParts.count() == 1) {
-                // location coordinates or place name
-                QString destination = urlParts[0];
-                goTo(destination);
             }
         } else {
             goToUser(gotoDialog.textValue());
         }