From 9832622fd9674d11f977741c0072da84c80ff474 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 10 Oct 2021 07:41:14 +0300 Subject: [PATCH 49/49] Qt: Do not reopen quit dialog when client is already set to really quit See osdn #41675 Signed-off-by: Marko Lindqvist --- client/gui-qt/fc_client.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/gui-qt/fc_client.cpp b/client/gui-qt/fc_client.cpp index d81da4b910..47f5f10ece 100644 --- a/client/gui-qt/fc_client.cpp +++ b/client/gui-qt/fc_client.cpp @@ -442,9 +442,12 @@ bool fc_client::event(QEvent *event) /************************************************************************//** Closes main window ****************************************************************************/ -void fc_client::closeEvent(QCloseEvent *event) { - popup_quit_dialog(); - event->ignore(); +void fc_client::closeEvent(QCloseEvent *event) +{ + if (!is_client_quitting()) { + popup_quit_dialog(); + event->ignore(); + } } /************************************************************************//** -- 2.33.0