summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-21 21:44:06 +0100
committerAndras Timar <andras.timar@collabora.com>2016-07-22 15:00:13 +0200
commit55d0469c8d1a576e9149ad7ddffda5a023b171c3 (patch)
treeffdd720c33f00d04069666f6e34718cf13a7d5e2
parent28f26e9719880674b1fb43e13ad6272d285bfb08 (diff)
Resolves: tdf#101054 crash on options->path with non-native file picker
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/27418 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 354c148edce5cafa1efb136630618f3063ce3c99)
-rw-r--r--cui/source/options/optpath.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index db2db7c3950a..5b9bfd0bc173 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -732,7 +732,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void
OUString sURL = xFolderPicker->getDirectory();
ChangeCurrentEntry( sURL );
}
- xFolderPicker.clear();
}
void SvxPathTabPage::GetPathList(