GUI: a temporary file was wrongly created when mimeview specified to open the parent (%F) and it happened to be a regular file
This commit is contained in:
parent
6575476d47
commit
5325c0a533
@ -332,11 +332,14 @@ void RclMain::startNativeViewer(Rcl::Doc doc, int pagenum, QString qterm)
|
|||||||
LOGDEB("StartNativeViewer: groksipath " << groksipath << " wantsf " <<
|
LOGDEB("StartNativeViewer: groksipath " << groksipath << " wantsf " <<
|
||||||
wantsfile << " wantsparentf " << wantsparentfile << "\n");
|
wantsfile << " wantsparentf " << wantsparentfile << "\n");
|
||||||
|
|
||||||
|
bool wantedfile_doc_has_ipath =
|
||||||
|
(wantsfile && !doc.ipath.empty()) || (wantsparentfile && !pdoc.ipath.empty());
|
||||||
|
|
||||||
// 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(fn.empty() ? "" : path_getfather(fn));
|
theconfig->setKeyDir(fn.empty() ? "" : path_getfather(fn));
|
||||||
if (((wantsfile || wantsparentfile) && fn.empty()) ||
|
if (((wantsfile || wantsparentfile) && fn.empty()) ||
|
||||||
(!groksipath && !doc.ipath.empty()) ) {
|
(!groksipath && wantedfile_doc_has_ipath) ) {
|
||||||
TempFile temp;
|
TempFile temp;
|
||||||
Rcl::Doc& thedoc = wantsparentfile ? pdoc : doc;
|
Rcl::Doc& thedoc = wantsparentfile ? pdoc : doc;
|
||||||
if (!FileInterner::idocToFile(temp, string(), theconfig, thedoc)) {
|
if (!FileInterner::idocToFile(temp, string(), theconfig, thedoc)) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user