From 9229214eead2c5d3751da6149b8c4d6e1abf2c47 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sun, 5 Oct 2008 14:11:04 +0000 Subject: [PATCH] fix bug 5332: preferences opens wrong folder for keyboard maps when there is no valid map git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26748 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiPrefs.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 37637a1eff..ca04de85cd 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -96,11 +96,14 @@ QString browseFile(QString const & filename, QString const & label1 = QString(), QString const & dir1 = QString(), QString const & label2 = QString(), - QString const & dir2 = QString()) + QString const & dir2 = QString(), + QString const & fallback_dir = QString()) { QString lastPath = "."; if (!filename.isEmpty()) lastPath = onlyPath(filename); + else if(!fallback_dir.isEmpty()) + lastPath = fallback_dir; FileDialog dlg(title, LFUN_SELECT_FILE_SYNC); dlg.setButton2(label1, dir1); @@ -139,7 +142,7 @@ QString browseLibFile(QString const & dir, QString const result = browseFile(toqstr( libFileSearch(dir, name, ext).absFilename()), - title, filters, false, dir1, dir2); + title, filters, false, dir1, dir2, QString(), QString(), dir1); // remove the extension if it is the default one QString noextresult; -- 2.39.2