yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

check the apptag flag before special-casing html document open

Browse source
This commit is contained in:
Jean-Francois Dockes 2013-05-24 13:54:41 +02:00
parent ee8cdda97e
commit e85c2c81f0
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/qtgui/rclmain_w.cpp
View file

@ -1646,7 +1646,8 @@ void RclMain::startNativeViewer(Rcl::Doc doc, int pagenum, QString term)
execpath.erase(); execpath.erase();
// Specialcase text/html because of the help browser need // Specialcase text/html because of the help browser need
if (execpath.empty() && !doc.mimetype.compare("text/html")) { if (execpath.empty() && !doc.mimetype.compare("text/html") &&
apptag.empty()) {
if (lookForHtmlBrowser(execpath)) { if (lookForHtmlBrowser(execpath)) {
lcmd.clear(); lcmd.clear();
lcmd.push_back(execpath); lcmd.push_back(execpath);
@ -1837,7 +1838,7 @@ void RclMain::startNativeViewer(Rcl::Doc doc, int pagenum, QString term)
transcode(ncmd, prcmd, fcharset, "UTF-8"); transcode(ncmd, prcmd, fcharset, "UTF-8");
QString msg = tr("Executing: [") + QString msg = tr("Executing: [") +
QString::fromUtf8(prcmd.c_str()) + "]"; QString::fromUtf8(prcmd.c_str()) + "]";
stb->showMessage(msg, 5000); stb->showMessage(msg, 10000);
} }
if (!istempfile) if (!istempfile)