[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-5' - cui/source

[Caolán McNamara]

 cui/source/options/optpath.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit ce43440dd910c2ff27e95db3009752cfb2b608e3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 21 21:44:06 2016 +0100

    Resolves: tdf#101054 crash on options->path with non-native file picker
    
    regression from...
    
    commit 3bbc0574d78d129359638b74612de2f93419eeb0
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Tue Jul 5 10:16:51 2016 +0100
    
        Resolves: rhbz#1352835 path options doesn't promptly destroy folder picker
    
    only clear the xFolderPicker immediately in the non-async case
    
    Change-Id: Id6a411424d41262a9379ad3eb7976c8dd666a5cf
    (cherry picked from commit c1bd3156cf66318023f36d81ce809a38072588e4)
    Reviewed-on: https://gerrit.libreoffice.org/27420
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5a0a87e..3001d12 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -711,7 +711,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void
         OUString sURL = xFolderPicker->getDirectory();
         ChangeCurrentEntry( sURL );
     }
-    xFolderPicker.clear();
 }
 
 void SvxPathTabPage::GetPathList(