From 074892591d87450aa5cb06844fb602743ccc6416 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 4 Jun 2018 11:10:29 -0700
Subject: [PATCH] fix auto-selecting subdir and not showing Choose when no row
 selected

---
 interface/resources/qml/dialogs/FileDialog.qml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index 49bfe78434..6651af0db3 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -332,6 +332,7 @@ ModalWindow {
             }
 
             onFolderChanged: {
+                d.clearSelection();
                 fileTableModel.update();  // Update once the data from the folder change is available.
             }
 
@@ -451,7 +452,7 @@ ModalWindow {
                     rows = 0,
                     i;
 
-                var newFilesModel = filesModelBuilder.createObject(root);
+                filesModel = filesModelBuilder.createObject(root);
 
                 comparisonFunction = sortOrder === Qt.AscendingOrder
                     ? function(a, b) { return a < b; }
@@ -473,7 +474,7 @@ ModalWindow {
                     while (lower < upper) {
                         middle = Math.floor((lower + upper) / 2);
                         var lessThan;
-                        if (comparisonFunction(sortValue, newFilesModel.get(middle)[sortField])) {
+                        if (comparisonFunction(sortValue, filesModel.get(middle)[sortField])) {
                             lessThan = true;
                             upper = middle;
                         } else {
@@ -482,7 +483,7 @@ ModalWindow {
                         }
                     }
 
-                    newFilesModel.insert(lower, {
+                    filesModel.insert(lower, {
                        fileName: fileName,
                        fileModified: (fileIsDir ? new Date(0) : model.getItem(i, "fileModified")),
                        fileSize: model.getItem(i, "fileSize"),
@@ -493,9 +494,6 @@ ModalWindow {
 
                     rows++;
                 }
-                filesModel = newFilesModel;
-
-                d.clearSelection();
             }
         }