[Libreoffice-commits] core.git: vcl/inc vcl/jsdialog

[Szymon KÅ‚os (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |    1 +
 vcl/jsdialog/jsdialogbuilder.cxx     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 67cdf39b467fc4dffd4b1dafc6d4aff2a09bfe70
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jan 19 15:55:29 2021 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Jan 21 06:53:06 2021 +0100

    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 at collabora.com>

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 0c274868c716..137659e9b217 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -89,6 +89,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 98eb4fbdeb3a..e8c8ff4d4232 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -167,7 +167,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)