summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2021-01-19 15:55:29 +0100
committerTomaž Vajngerl <quikee@gmail.com>2021-02-05 09:01:08 +0100
commitfcaae67aaf206dd5424c6cdb206e156173114d55 (patch)
treea55f408555dee743f595db33a284807ce6c8e4b7
parentc07f037dc4dc39478fe1448d52db76374cfc87b8 (diff)
jsdialog: flush message queue on dialog close
Change-Id: I9e7d24e43a7ee7bf1a006c8d16e7b47a6b714fd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109644 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109948 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--vcl/inc/jsdialog/jsdialogbuilder.hxx1
-rw-r--r--vcl/jsdialog/jsdialogbuilder.cxx2
2 files changed, 2 insertions, 1 deletions
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 52533c0b8f2a..25a2f04ad473 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -91,6 +91,7 @@ public:
virtual void sendFullUpdate(bool bForce = false);
void sendClose();
virtual void sendUpdate(VclPtr<vcl::Window> pWindow);
+ void flush() { mpIdleNotify->Invoke(); }
protected:
void initializeSender(VclPtr<vcl::Window> aNotifierWindow, VclPtr<vcl::Window> aContentWindow,
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 54c773cc2fdf..55fdb2bd995d 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -158,7 +158,7 @@ void JSDialogSender::sendFullUpdate(bool bForce)
void JSDialogSender::sendClose()
{
mpIdleNotify->sendMessage(jsdialog::MessageType::Close, nullptr);
- mpIdleNotify->Start();
+ flush();
}
void JSDialogSender::sendUpdate(VclPtr<vcl::Window> pWindow)