From bbdf2c1be0a87309c2eaa6c711027e7c2f8bd8d6 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 21 Jul 2016 21:44:06 +0100
Subject: Resolves: tdf#101054 crash on options->path with non-native file
 picker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

regression from...

commit 3bbc0574d78d129359638b74612de2f93419eeb0
Author: Caolán McNamara <caolanm@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@googlemail.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit ce43440dd910c2ff27e95db3009752cfb2b608e3)
---
 cui/source/options/optpath.cxx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5a0a87e69ae7..3001d12b17e2 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(
-- 
cgit