GUI: Fix status bar not showing text when it should

xoreos · Dec 29, 2017 · 305fd5e · 305fd5e
1 parent 00e2254
commit 305fd5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -251,6 +251,7 @@ void MainWindow::slotLog(const QString &text) {
     _log->append(text);
 }
 
+// called when the populate thread finishes
 void MainWindow::finishTree() {
     if (_proxyModel)
         delete _proxyModel;
@@ -270,18 +271,16 @@ void MainWindow::finishTree() {
     QObject::connect(_treeView->selectionModel(), &QItemSelectionModel::selectionChanged,
                      this, &MainWindow::resourceSelect);
 
-    _status->setText("Idle...");
+    _status->pop();
 }
 
 void MainWindow::setTreeViewModel(const QString &path) {
     if (_rootPath == path)
         return;
     _rootPath = path;
 
+    // popped in finishTree
     _status->push("Populating resource tree...");
-    BOOST_SCOPE_EXIT((&_status)) {
-        _status->pop();
-    } BOOST_SCOPE_EXIT_END
 
     _treeView->setModel(nullptr);
 

diff --git a/src/gui/resourcetree.cpp b/src/gui/resourcetree.cpp
@@ -55,8 +55,6 @@ ResourceTree::ResourceTree(MainWindow *mainWindow, const QString &path, QObject
 
     _root = new ResourceTreeItem("Filename", nullptr);
 
-    _mainWindow->status()->setText("Populating resource tree...");
-
     ResourceTreeItem *top = _root;
 
     // If the root path is a directory, add a top level item