From 2a84d9a6ab2944ad184778decf7d2077235088b8 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 13 Mar 2015 10:06:49 -0700 Subject: [PATCH] Fix issue with .svo's not loading when the url has parameters --- interface/src/Application.cpp | 7 ++++--- interface/src/GLCanvas.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 72c17ed09b..25077e0ac1 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -889,7 +889,7 @@ bool Application::event(QEvent* event) { if (!url.isEmpty()) { if (url.scheme() == HIFI_URL_SCHEME) { DependencyManager::get()->handleLookupString(fileEvent->url().toString()); - } else if (url.url().toLower().endsWith(SVO_EXTENSION)) { + } else if (url.path().toLower().endsWith(SVO_EXTENSION)) { emit svoImportRequested(url.url()); } } @@ -1455,10 +1455,11 @@ void Application::dropEvent(QDropEvent *event) { QString snapshotPath; const QMimeData *mimeData = event->mimeData(); foreach (QUrl url, mimeData->urls()) { - if (url.url().toLower().endsWith(SNAPSHOT_EXTENSION)) { + auto lower = url.path().toLower(); + if (lower.endsWith(SNAPSHOT_EXTENSION)) { snapshotPath = url.toLocalFile(); break; - } else if (url.url().toLower().endsWith(SVO_EXTENSION)) { + } else if (lower.endsWith(SVO_EXTENSION)) { emit svoImportRequested(url.url()); event->acceptProposedAction(); return; diff --git a/interface/src/GLCanvas.cpp b/interface/src/GLCanvas.cpp index 4ece8f0857..4587fca0f4 100644 --- a/interface/src/GLCanvas.cpp +++ b/interface/src/GLCanvas.cpp @@ -170,7 +170,7 @@ void GLCanvas::wheelEvent(QWheelEvent* event) { void GLCanvas::dragEnterEvent(QDragEnterEvent* event) { const QMimeData *mimeData = event->mimeData(); foreach (QUrl url, mimeData->urls()) { - auto lower = url.url().toLower(); + auto lower = url.path().toLower(); if (lower.endsWith(SNAPSHOT_EXTENSION) || lower.endsWith(SVO_EXTENSION)) { event->acceptProposedAction(); break;