tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preview and Open for web cache: setKeyDir(getfather("")) resulted in ./ and getConfParam() failures

Browse Source
This commit is contained in:
Jean-Francois Dockes 2016-04-12 18:13:10 +02:00
parent 9db024791f
commit 5d6b1ea2a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qtgui/preview_w.cpp
View File

@ -832,7 +832,7 @@ bool Preview::loadDocInCurrentTab(const Rcl::Doc &idoc, int docnum)
// If the command wants a file but this is not a file url, or // If the command wants a file but this is not a file url, or
// there is an ipath that it won't understand, we need a temp file: // there is an ipath that it won't understand, we need a temp file:
theconfig->setKeyDir(path_getfather(fn)); theconfig->setKeyDir(fn.empty() ? "" : path_getfather(fn));
if (fn.empty() || !idoc.ipath.empty()) { if (fn.empty() || !idoc.ipath.empty()) {
TempFile temp = lthr.tmpimg; TempFile temp = lthr.tmpimg;
if (temp) { if (temp) {

6
src/qtgui/rclm_view.cpp
View File

@ -293,12 +293,12 @@ void RclMain::startNativeViewer(Rcl::Doc doc, int pagenum, QString term)
bool enterHistory = false; bool enterHistory = false;
bool istempfile = false; bool istempfile = false;
LOGDEB(("RclMain::startNV: groksipath %d wantsf %d wantsparentf %d\n", LOGDEB(("RclMain::startNV: groksipath %d wantsf %d wantsparentf %d\n",
groksipath, wantsfile, wantsparentfile)); groksipath, wantsfile, wantsparentfile));
// If the command wants a file but this is not a file url, or // If the command wants a file but this is not a file url, or
// there is an ipath that it won't understand, we need a temp file: // there is an ipath that it won't understand, we need a temp file:
theconfig->setKeyDir(path_getfather(fn)); theconfig->setKeyDir(fn.empty() ? "" : path_getfather(fn));
if (!doc.isFsFile() || if (!doc.isFsFile() ||
((wantsfile || wantsparentfile) && fn.empty()) || ((wantsfile || wantsparentfile) && fn.empty()) ||
(!groksipath && !doc.ipath.empty()) ) { (!groksipath && !doc.ipath.empty()) ) {