summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorEran Mizrahi <erasmux@gmail.com>2017-12-09 21:39:22 +0200
committerEran Mizrahi <erasmux@gmail.com>2017-12-10 02:53:19 +0200
commit66b17eea8ac83ee6f7b729974240d995a1e8ed3a (patch)
tree8a89aef1c9122dc7b233aa823880d9f60231e91f /src/mainwindow.cpp
parent89b1f1d48dd05b372abca64b311b1107f044a897 (diff)
Wait for processes run using command line shortcuts
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp21
1 files changed, 3 insertions, 18 deletions
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();