Show "Loading..." item in DataRecoveryView if the list wasn't loaded …

…before we click the "Recover Files..." option
ayuusweetfish · May 28, 2019 · df741c2 · df741c2
1 parent 5488301
commit df741c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/data/strings/en.ini b/data/strings/en.ini
@@ -1208,6 +1208,7 @@ delete = Delete
 refresh = Refresh
 raw_images_as_frames = Raw Images as Frames
 raw_images_as_layers = Raw Images as Layers
+loading = Loading...
 crash_sessions = Crashed Sessions
 old_sessions = Previous Sessions
 incompatible = [MIGHT BE INCOMPATIBLE v{1}] {0}

diff --git a/src/app/crash/data_recovery.h b/src/app/crash/data_recovery.h
@@ -33,6 +33,8 @@ namespace crash {
     // Launches the thread to search for sessions.
     void launchSearch();
 
+    bool isSearching() const { return m_searching; }
+
     // Returns true if there is at least one sessions with sprites to
     // recover (i.e. a crashed session were changes weren't saved)
     bool hasRecoverySessions() const;

diff --git a/src/app/ui/data_recovery_view.cpp b/src/app/ui/data_recovery_view.cpp
@@ -130,8 +130,13 @@ void DataRecoveryView::clearList()
 void DataRecoveryView::fillList()
 {
   clearList();
-  fillListWith(true);
-  fillListWith(false);
+
+  if (m_dataRecovery->isSearching())
+    m_listBox.addChild(new ListItem(Strings::recover_files_loading()));
+  else {
+    fillListWith(true);
+    fillListWith(false);
+  }
 }
 
 void DataRecoveryView::fillListWith(const bool crashes)
@@ -296,12 +301,11 @@ void DataRecoveryView::onDelete()
 
 void DataRecoveryView::onRefresh()
 {
-  clearList();
+  m_dataRecovery->launchSearch();
+
+  fillList();
   onChangeSelection();
-  m_listBox.addChild(new ListItem("Loading..."));
   layout();
-
-  m_dataRecovery->launchSearch();
 }
 
 void DataRecoveryView::onChangeSelection()