From 3b21348a6319d82328d5edab721b67d0742ed36f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 12 Sep 2014 15:22:51 -0700 Subject: [PATCH] make sure AddressManager signal is connected to before file event --- interface/src/Application.cpp | 19 ++++++++++--------- libraries/networking/src/AddressManager.cpp | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 1e8be6dca2..3664df53ab 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -290,6 +290,15 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : // once the event loop has started, check and signal for an access token QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection); + + AddressManager& addressManager = AddressManager::getInstance(); + + // connect to the domainChangeRequired signal on AddressManager + connect(&addressManager, &AddressManager::possibleDomainChangeRequired, + this, &Application::changeDomainHostname); + + // when -url in command line, teleport to location + addressManager.handleLookupString(getCmdOption(argc, constArgv, "-url")); _settings = new QSettings(this); _numChangedSettings = 0; @@ -403,15 +412,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : connect(_window, &MainWindow::windowGeometryChanged, _runningScriptsWidget, &RunningScriptsWidget::setBoundary); - - AddressManager& addressManager = AddressManager::getInstance(); - - // connect to the domainChangeRequired signal on AddressManager - connect(&addressManager, &AddressManager::possibleDomainChangeRequired, - this, &Application::changeDomainHostname); - - // when -url in command line, teleport to location - addressManager.handleLookupString(getCmdOption(argc, constArgv, "-url")); // call the OAuthWebviewHandler static getter so that its instance lives in our thread OAuthWebViewHandler::getInstance(); @@ -810,6 +810,7 @@ bool Application::event(QEvent* event) { // handle custom URL if (event->type() == QEvent::FileOpen) { + QFileOpenEvent* fileEvent = static_cast(event); if (!fileEvent->url().isEmpty()) { diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 8d35216558..13af32bc83 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -52,6 +52,8 @@ const JSONCallbackParameters& AddressManager::apiCallbackParameters() { bool AddressManager::handleUrl(const QUrl& lookupUrl) { if (lookupUrl.scheme() == HIFI_URL_SCHEME) { + qDebug() << "Trying to go to URL" << lookupUrl.toString(); + // there are 4 possible lookup strings // 1. global place name (name of domain or place) - example: sanfrancisco