From 66b17eea8ac83ee6f7b729974240d995a1e8ed3a Mon Sep 17 00:00:00 2001
From: Eran Mizrahi <erasmux@gmail.com>
Date: Sat, 9 Dec 2017 21:39:22 +0200
Subject: Wait for processes run using command line shortcuts

---
 src/mainwindow.cpp | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b47e9c57..1db895fc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1465,17 +1465,18 @@ void MainWindow::storeSettings(QSettings &settings) {
   }
 }
 
-void MainWindow::lock()
+ILockedWaitingForProcess* MainWindow::lock()
 {
   if (m_LockDialog != nullptr) {
     ++m_LockCount;
-    return;
+    return m_LockDialog;
   }
   m_LockDialog = new LockedDialog(qApp->activeWindow());
   m_LockDialog->show();
   setEnabled(false);
   m_LockDialog->setEnabled(true); //What's the point otherwise?
   ++m_LockCount;
+  return m_LockDialog;
 }
 
 void MainWindow::unlock()
@@ -1494,22 +1495,6 @@ void MainWindow::unlock()
   }
 }
 
-bool MainWindow::unlockClicked()
-{
-  if (m_LockDialog != nullptr) {
-    return m_LockDialog->unlockClicked();
-  } else {
-    return false;
-  }
-}
-
-void MainWindow::setProcessName(QString const &name)
-{
-  if (m_LockDialog != nullptr) {
-    m_LockDialog->setProcessName(name);
-  }
-}
-
 void MainWindow::on_btnRefreshData_clicked()
 {
   m_OrganizerCore.refreshDirectoryStructure();
-- 
cgit v1.3.1