r21157 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Sun Apr 3 21:50:18 UTC 2016
Author: jghali
Date: Sun Apr 3 21:50:18 2016
New Revision: 21157
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21157
Log:
#13400: Help > Scribus Homepage hangs Scribus <jurajF>
Modified:
trunk/Scribus/scribus/urllauncher.cpp
Modified: trunk/Scribus/scribus/urllauncher.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21157&path=/trunk/Scribus/scribus/urllauncher.cpp
==============================================================================
--- trunk/Scribus/scribus/urllauncher.cpp (original)
+++ trunk/Scribus/scribus/urllauncher.cpp Sun Apr 3 21:50:18 2016
@@ -50,7 +50,7 @@
void UrlLauncher::launchUrlExt(const QUrl& link, QWidget *parent)
{
- if (link.scheme()=="http")
+ if (link.scheme()=="http" || link.scheme()=="https")
{
QWidget *p=parent;
if (p==0)
@@ -71,8 +71,8 @@
{
QStringList args;
args << link.toString();
- int ret=System(extBrowser, args);
- if (ret!=0)
+ bool ok = QProcess::startDetached(extBrowser, args);
+ if (!ok)
{
QMessageBox::StandardButton sb=ScMessageBox::critical(p, tr("External Web Browser Failed to Start"), tr("Scribus was not able to start the external web browser application %1. Please check the setting in Preferences.\nWould you like to start the system's default browser instead?").arg(PrefsManager::instance()->extBrowserExecutable()), QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Ok);
if (sb==QMessageBox::Ok)
More information about the scribus-commit
mailing list