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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/client
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2010-09-07 14:33:42
Message-ID: 20100907143342.14E41AC7CB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172570 by lunakl:

avoid infinite loop when the service configured as the default
browser doesn't exist (bnc#623478)



 M  +2 -1      kfmclient.cpp  


--- trunk/KDE/kdebase/apps/konqueror/client/kfmclient.cpp #1172569:1172570
@@ -333,7 +333,8 @@
         KConfig config(QLatin1String("kfmclientrc"));
         KConfigGroup generalGroup(&config, "General");
         const QString browserApp = generalGroup.readEntry("BrowserApplication");
-        if (!browserApp.isEmpty() && !browserApp.startsWith("!kfmclient"))
+        if (!browserApp.isEmpty() && !browserApp.startsWith("!kfmclient")
+            && (browserApp.startsWith('!') || KService::serviceByStorageId(browserApp)))
         {
             kDebug() << "Using external browser" << browserApp;
             Q_ASSERT( qApp );
[prev in list] [next in list] [prev in thread] [next in thread]