[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source

[Szymon KÅ‚os (via logerrit)]

 desktop/source/lib/init.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 5aea21c0f92be5ac2fc1bd510723c1de3f01f058
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jun 16 12:06:56 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jun 23 10:17:38 2020 +0200

    jsdialog: try call welded action even if window doesn't exist
    
    Change-Id: I8ae96d2e61899c89b5ddb8ff362d8a066ded3960
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96922
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2d043e276a7c..771bc2e72b02 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3580,12 +3580,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin
     if (!pWindow && nWindowId >= 1000000000 /* why unsigned? */)
         pWindow = getSidebarWindow();
 
-    if (!pWindow)
-    {
-        SetLastExceptionMsg("Document doesn't support dialog rendering, or window not found.");
-        return;
-    }
-    else if (aMap.find("id") != aMap.end())
+    if (aMap.find("id") != aMap.end())
     {
         static const OUString sClickAction("CLICK");
         static const OUString sSelectAction("SELECT");
@@ -3700,6 +3695,12 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin
                 }
             }
 
+            if (!pWindow)
+            {
+                SetLastExceptionMsg("Document doesn't support dialog rendering, or window not found.");
+                return;
+            }
+
             if (!bIsWeldedDialog || bContinueWithLOKWindow)
             {
                 WindowUIObject aUIObject(pWindow);