[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/client
From:       David Faure <faure () kde ! org>
Date:       2009-10-15 12:45:53
Message-ID: 1255610753.369994.7538.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1035589 by dfaure:

Fix fork-bomb when setting "kfmclient openURL" as the webbrowser in kcmshell4 componentchooser.


 M  +3 -2      kfmclient.cpp  


--- trunk/KDE/kdebase/apps/konqueror/client/kfmclient.cpp #1035588:1035589
@@ -328,9 +328,10 @@
     {
         KConfig config(QLatin1String("kfmclientrc"));
         KConfigGroup generalGroup(&config, "General");
-        if (!generalGroup.readEntry("BrowserApplication").isEmpty())
+        const QString browserApp = generalGroup.readEntry("BrowserApplication");
+        if (!browserApp.isEmpty() && !browserApp.startsWith("!kfmclient"))
         {
-            kDebug() << "Using external browser" << generalGroup.readEntry( "BrowserApplication" );
+            kDebug() << "Using external browser" << browserApp;
             Q_ASSERT( qApp );
             //ClientApp app;
 #ifdef Q_WS_X11
[prev in list] [next in list] [prev in thread] [next in thread]