Merge pull request #604 from FSMaxB/fix-accidental-deletion-of-all-passwords

Fix accidental deletion of entire passwordstore

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 53469272..6e7dcffb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -640,6 +640,14 @@ void MainWindow::addPassword() {
  * sure.
  */
 void MainWindow::onDelete() {
+  QModelIndex currentIndex = ui->treeView->currentIndex();
+  if (!currentIndex.isValid()) {
+    // This fixes https://github.com/IJHack/QtPass/issues/556
+    // Otherwise the entire password directory would be deleted if
+    // nothing is selected in the tree view.
+    return;
+  }
+
   QFileInfo fileOrFolder =
       model.fileInfo(proxyModel.mapToSource(ui->treeView->currentIndex()));
   QString file = "";