Reset 'autoquit' on user interaction

2 files changed, 13 insertions, 6 deletions

diff --git a/src/dialog.cpp b/src/dialog.cpp
index f93a8bd..efe659d 100644
--- a/src/dialog.cpp
+++ b/src/dialog.cpp
@@ -31,6 +31,7 @@ Dialog::Dialog(int defaultTab, bool examMode, QWidget *parent)
     userInteracted_ = false;
     genericExpandedOnce_ = false;
     examMode_ = examMode;
+    autoQuit_ = g_autoQuitSeconds;
 
     ui->setupUi(this);
 
@@ -183,7 +184,7 @@ void Dialog::on_treeView_doubleClicked(const QModelIndex& index)
         }
         ChooserSettings::setSetting("last-session", (s->shortDescription()));
         ChooserSettings::setSetting("last-tab", QString::number(activeTab_));
-        g_autoQuitSeconds = 0; // So we don't kill the session :>
+        autoQuit_ = 0; // So we don't kill the session :>
         setVisible(false);
     } else {
         QMessageBox::warning(
@@ -398,13 +399,15 @@ void Dialog::onCenterTimer() {
         }
     }
     // Handle auto-quit timeout
-    if (g_autoQuitSeconds > 0) {
-        g_autoQuitSeconds--;
-        if (g_autoQuitSeconds == 0) {
+    if (autoQuit_ > 0) {
+        autoQuit_--;
+        if (autoQuit_ == 0) {
             qApp->exit(0);
-        } else if (g_autoQuitSeconds < 60) {
-            ui->lblAutoQuit->setText(this->trUtf8("Auto logout in %1").arg(g_autoQuitSeconds));
+        } else if (autoQuit_ < 60) {
+            ui->lblAutoQuit->setText(this->trUtf8("Auto logout in %1").arg(autoQuit_));
             ui->lblAutoQuit->show();
+        } else if (ui->lblAutoQuit->isVisible()) {
+            ui->lblAutoQuit->hide();
         }
     }
 }
@@ -822,6 +825,7 @@ void Dialog::selectFirstElement() {
 /* install this filter to the filterEdit to listen for arrow keys */
 bool Dialog::eventFilter(QObject*, QEvent *event) {
     if (event->type() == QEvent::KeyPress) {
+        autoQuit_ = g_autoQuitSeconds;
         QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
         bool fortv = false;
         if (keyEvent->key() == Qt::Key_Right) {
@@ -844,6 +848,8 @@ bool Dialog::eventFilter(QObject*, QEvent *event) {
             ui->treeView->setFocus();
             return true;
         }
+    } else if (event->type() == QEvent::MouseMove) {
+        autoQuit_ = g_autoQuitSeconds;
     }
     return false;
 }
diff --git a/src/dialog.h b/src/dialog.h
index ea042cd..c0e2b43 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -54,6 +54,7 @@ class Dialog : public QDialog {
     QString autoStartEntry_;
     int activeTab_;
     int defaultTab_;
+    int autoQuit_;
     bool userInteracted_;
     bool genericExpandedOnce_;
     bool examMode_;