From e85c2c81f039d8aea9dc017fac7d8fbf3e60fca0 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 24 May 2013 13:54:41 +0200 Subject: [PATCH] check the apptag flag before special-casing html document open --- src/qtgui/rclmain_w.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp index eb61e5cf..177df634 100644 --- a/src/qtgui/rclmain_w.cpp +++ b/src/qtgui/rclmain_w.cpp @@ -1646,7 +1646,8 @@ void RclMain::startNativeViewer(Rcl::Doc doc, int pagenum, QString term) execpath.erase(); // 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)) { lcmd.clear(); lcmd.push_back(execpath); @@ -1837,7 +1838,7 @@ void RclMain::startNativeViewer(Rcl::Doc doc, int pagenum, QString term) transcode(ncmd, prcmd, fcharset, "UTF-8"); QString msg = tr("Executing: [") + QString::fromUtf8(prcmd.c_str()) + "]"; - stb->showMessage(msg, 5000); + stb->showMessage(msg, 10000); } if (!istempfile)