[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit d7dda384405487ae7edb3519201222cb12c08e26
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Sep 21 20:07:18 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Oct 8 11:40:42 2019 +0200

    set wait on the dialog, not the page parent
    
    Change-Id: If782e774fee91a427d4bda575b2f404fd636f534
    Reviewed-on: https://gerrit.libreoffice.org/79320
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 799440789bb2..18b16b9c227a 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -898,9 +898,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 ), "" ) )