From 81344771dd03fd844daeedcbf3545103db3898c0 Mon Sep 17 00:00:00 2001
From: Eran Mizrahi <erasmux@gmail.com>
Date: Wed, 13 Dec 2017 09:49:09 +0200
Subject: Locked dialog fixes (fix mainwindow modalness; use normal window to
 fix parentless scenario)

---
 src/lockeddialog.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/lockeddialog.h')

diff --git a/src/lockeddialog.h b/src/lockeddialog.h
index 8803efae..82a15a93 100644
--- a/src/lockeddialog.h
+++ b/src/lockeddialog.h
@@ -45,7 +45,7 @@ class LockedDialog : public QDialog, public ILockedWaitingForProcess
     Q_OBJECT
 
 public:
-  explicit LockedDialog(QWidget *parent = 0, const QString &text = "", bool unlockButton = true);
+  explicit LockedDialog(QWidget *parent = 0, bool unlockByButton = false);
   ~LockedDialog();
 
   /**
@@ -53,7 +53,7 @@ public:
    *
    * @return true if the user clicked the unlock button
    **/
-  bool unlockClicked() override { return m_UnlockClicked; }
+  bool unlockForced() override;
 
   /**
    * @brief set the name of the process being run
@@ -65,13 +65,18 @@ protected:
 
   virtual void resizeEvent(QResizeEvent *event);
 
+  virtual void reject();
+
 private slots:
 
   void on_unlockButton_clicked();
 
 private:
+  void unlock();
+
   Ui::LockedDialog *ui;
-  bool m_UnlockClicked;
+  bool m_Unlocked;
+  bool m_allowClose;
 };
 
 #endif // LOCKEDDIALOG_H
-- 
cgit v1.3.1