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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/background
From:       Andreas Kling <kling () impul ! se>
Date:       2006-07-21 22:53:28
Message-ID: 1153522408.332132.12763.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 564984 by kling:

Forward-port SVN commit 564948 by kling: 
 
Check that m_CurrentWallpaper is >= 0 in currentWallpaper(). 
Fixes a long-standing freeze/crash in kdesktop, among other things. 
    
CCBUG: 124633


 M  +1 -1      bgsettings.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/background/bgsettings.cpp #564983:564984
@@ -992,7 +992,7 @@
 	return QString();
     if (m_MultiMode == NoMulti || m_MultiMode == NoMultiRandom)
 	return m_Wallpaper;
-    if (m_CurrentWallpaper < (int) m_WallpaperFiles.count())
+    if (m_CurrentWallpaper >= 0 && m_CurrentWallpaper < (int) m_WallpaperFiles.count())
 	return m_WallpaperFiles[m_CurrentWallpaper];
     return QString();
 }
[prev in list] [next in list] [prev in thread] [next in thread]