[Libreoffice-commits] core.git: cui/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/cuigaldlg.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ca637f21a30b45869a447b8b88d7b2a06a1b5a68
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Sep 21 20:07:18 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Sep 21 22:00:03 2019 +0200

    set wait on the dialog, not the page parent
    
    Change-Id: If782e774fee91a427d4bda575b2f404fd636f534
    Reviewed-on: https://gerrit.libreoffice.org/79319
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a90ef52b916a..54d7894d4fe9 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -894,9 +894,8 @@ void TPGalleryThemeProperties::DoPreview()
 
         if (!m_aWndPreview.SetGraphic(_aURL))
         {
-            GetParent()->LeaveWait();
+            weld::WaitObject aWaitObject(GetDialogFrameWeld());
             ErrorHandler::HandleError(ERRCODE_IO_NOTEXISTSPATH, GetDialogFrameWeld());
-            GetParent()->EnterWait();
         }
 #if HAVE_FEATURE_AVMEDIA
         else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "" ) )