From 16c7cc5605d4e71f509acfcb4881df833de11853 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 10 Jul 2020 13:58:58 -0400
Subject: fixed ensureFullyLoaded() taking forever because it was queuing all
 the sorts unnecessarily

---
 src/filetreemodel.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/filetreemodel.cpp')

diff --git a/src/filetreemodel.cpp b/src/filetreemodel.cpp
index cf5bc665..11901c43 100644
--- a/src/filetreemodel.cpp
+++ b/src/filetreemodel.cpp
@@ -226,7 +226,7 @@ void FileTreeModel::clear()
 void FileTreeModel::recursiveFetchMore(const QModelIndex& m)
 {
   if (canFetchMore(m)) {
-    fetchMore(m);
+    doFetchMore(m, false);
   }
 
   for (int i=0; i<rowCount(m); ++i) {
@@ -337,6 +337,11 @@ bool FileTreeModel::canFetchMore(const QModelIndex& parent) const
 }
 
 void FileTreeModel::fetchMore(const QModelIndex& parent)
+{
+  doFetchMore(parent, true);
+}
+
+void FileTreeModel::doFetchMore(const QModelIndex& parent, bool forFetch)
 {
   FileTreeItem* item = itemFromIndex(parent);
   if (!item) {
@@ -354,7 +359,7 @@ void FileTreeModel::fetchMore(const QModelIndex& parent)
   }
 
   const auto parentPath = item->dataRelativeParentPath();
-  update(*item, *parentEntry, parentPath.toStdWString(), true);
+  update(*item, *parentEntry, parentPath.toStdWString(), forFetch);
 }
 
 QVariant FileTreeModel::data(const QModelIndex& index, int role) const
-- 
cgit v1.3.1