From 6592a6dca28a4f6c47a06fa79d5541370ce3cd56 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 15 Aug 2014 10:28:22 -0700 Subject: [PATCH] Fix for custom URL schemes --- interface/src/Application.cpp | 3 +-- interface/src/Menu.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9d49dc6281..efc638a9c2 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -814,9 +814,8 @@ bool Application::event(QEvent* event) { QFileOpenEvent* fileEvent = static_cast(event); bool isHifiSchemeURL = !fileEvent->url().isEmpty() && fileEvent->url().toLocalFile().startsWith(CUSTOM_URL_SCHEME); if (isHifiSchemeURL) { - Menu::getInstance()->goTo(fileEvent->url().toString()); + Menu::getInstance()->goToURL(fileEvent->url().toLocalFile()); } - return false; } return QApplication::event(event); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index e6850aac6d..c21b533695 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -1153,8 +1153,8 @@ void Menu::goTo() { } bool Menu::goToURL(QString location) { - if (location.startsWith(CUSTOM_URL_SCHEME + "//")) { - QStringList urlParts = location.remove(0, CUSTOM_URL_SCHEME.length() + 2).split('/', QString::SkipEmptyParts); + if (location.startsWith(CUSTOM_URL_SCHEME + "/")) { + QStringList urlParts = location.remove(0, CUSTOM_URL_SCHEME.length()).split('/', QString::SkipEmptyParts); if (urlParts.count() > 1) { // if url has 2 or more parts, the first one is domain name