From e37010565fd77ff0e4778d5c44d3d70831abe467 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 7 Nov 2017 16:55:07 -0800
Subject: [PATCH] changed fileDialog return value to be compatible with musvis

---
 interface/src/Application.cpp    | 4 ----
 libraries/ui/src/OffscreenUi.cpp | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d099af9ea0..0b580ddb5d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2702,7 +2702,6 @@ bool Application::importFromZIP(const QString& filePath) {
     return true;
 }
 
-<<<<<<< HEAD
 bool Application::importFromFBX(const QString& filePath) {
     qDebug() << "An fbx file has been dropped in: " << filePath;
     QUrl empty;
@@ -2715,9 +2714,6 @@ bool Application::importFromFBX(const QString& filePath) {
     return true;
 }
 
-=======
-// thread-safe
->>>>>>> 85efe5265d1e31eccae22571e407b938030c8f6e
 void Application::onPresent(quint32 frameCount) {
     bool expected = false;
     if (_pendingIdleEvent.compare_exchange_strong(expected, true)) {
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 297ed9ca50..96272c4f1f 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -720,7 +720,8 @@ QString OffscreenUi::fileDialog(const QVariantMap& properties) {
         return QString();
     }
     qCDebug(uiLogging) << result.toString();
-    return result.toUrl().toLocalFile();
+    // originally was result.toUrl().toLocalFile();, but toLocalFile() is not working
+    return result.toString();
 }
 
 ModalDialogListener* OffscreenUi::fileDialogAsync(const QVariantMap& properties) {