[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:15:54
Message-ID: 20100907141554.0FF2DAC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172559 by lunakl:

avoid infinite loop with weird setup with other KDE version, just in case



 M  +2 -1      kfmclient.cpp  


--- trunk/KDE/kdebase/apps/konqueror/client/kfmclient.cpp #1172558:1172559
@@ -122,9 +122,10 @@
         version = 3;
     else
         version = atoi( getenv( "KDE_SESSION_VERSION" ));
-    if( version != 0 && version != KDE_VERSION_MAJOR )
+    if( version != 0 && version != KDE_VERSION_MAJOR && getenv( "KFMCLIENT_LOOP" ) == NULL )
     {
         kDebug() << "Forwarding to kfmclient from KDE version " << version;
+        setenv( "KFMCLIENT_LOOP", "1", true ); // loop protection, just in case
         char wrapper[ 10 ];
         sprintf( wrapper, "kde%d", version );
         char** newargv = new char*[ argc + 2 ];
[prev in list] [next in list] [prev in thread] [next in thread]