Kill timer when dialog is hidden (open-eid#1042)

IB-7284 Signed-off-by: Raul Metsma <[email protected]>
metsma · Mar 24, 2022 · 554f613 · 554f613
1 parent 323fd86
commit 554f613
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/client/dialogs/WaitDialog.cpp b/client/dialogs/WaitDialog.cpp
@@ -26,8 +26,6 @@
 #include "Styles.h"
 #include "effects/Overlay.h"
 
-#include <QTimer>
-
 WaitDialog* WaitDialog::waitDialog = nullptr;
 
 WaitDialog::WaitDialog(QWidget *parent)
@@ -40,6 +38,8 @@ WaitDialog::WaitDialog(QWidget *parent)
 	ui->movie->load(QStringLiteral(":/images/wait.svg"));
 	ui->label->setFont(Styles::font(Styles::Condensed, 24));
 	move(parent->geometry().center() - geometry().center());
+	timer.setSingleShot(true);
+	connect(&timer, &QTimer::timeout, this, &WaitDialog::show);
 }
 
 WaitDialog::~WaitDialog()
@@ -78,8 +78,8 @@ WaitDialogHolder::WaitDialogHolder(QWidget *parent, const QString &text, bool sh
 	dialog->setText(text);
 	if(show)
 		dialog->show();
-	else if(!dialog->isHidden())
-		QTimer::singleShot(5000, dialog, &WaitDialog::show);
+	else
+		dialog->timer.start(5000);
 }
 
 WaitDialogHolder::~WaitDialogHolder()
@@ -92,7 +92,10 @@ WaitDialogHolder::~WaitDialogHolder()
 WaitDialogHider::WaitDialogHider()
 {
 	if(WaitDialog *d = WaitDialog::instance())
+	{
+		d->timer.stop();
 		d->hide();
+	}
 }
 
 WaitDialogHider::~WaitDialogHider()

diff --git a/client/dialogs/WaitDialog_p.h b/client/dialogs/WaitDialog_p.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <QDialog>
+#include <QTimer>
 
 namespace Ui {
 class WaitDialog;
@@ -39,7 +40,7 @@ class WaitDialog : public QDialog
 	static void destroy();
 	static WaitDialog* instance();
 
-private:
 	Ui::WaitDialog *ui;
 	static WaitDialog *waitDialog;
+	QTimer timer;
 };