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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/config
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2008-08-31 9:39:04
Message-ID: 1220175544.667307.14333.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 855179 by ossi:

do not crash in expandString() if KGlobal::mainComponent() is not inited
yet.
patch inspired by the redhat guys.
BUG: 170043


 M  +6 -3      kconfiggroup.cpp  


--- trunk/KDE/kdelibs/kdecore/config/kconfiggroup.cpp #855178:855179
@@ -394,9 +394,12 @@
 
             QString result;
             QByteArray oldpath = qgetenv( "PATH" );
-            QByteArray newpath = QFile::encodeName( KGlobal::dirs()->resourceDirs( \
                "exe" ).join( QChar( KPATH_SEPARATOR ) ) );
-            if( !newpath.isEmpty() && !oldpath.isEmpty() )
-                newpath += KPATH_SEPARATOR;
+            QByteArray newpath;
+            if (KGlobal::hasMainComponent()) {
+                newpath = QFile::encodeName( KGlobal::dirs()->resourceDirs( "exe" \
).join( QChar( KPATH_SEPARATOR ) ) ); +                if (!newpath.isEmpty() && \
!oldpath.isEmpty()) +                    newpath += KPATH_SEPARATOR;
+            }
             newpath += oldpath;
             setenv( "PATH", newpath, 1/*overwrite*/ );
             FILE *fs = popen(QFile::encodeName(cmd).data(), "r");


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