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

List:       kde-commits
Subject:    kdebase/kcontrol/screensaver
From:       Laurent Montel <montel () kde ! org>
Date:       2004-11-02 10:58:01
Message-ID: 20041102105801.520D916C0D () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Fix when we have two screensaver which have same name but
in different category


  M +15 -4     scrnsave.cpp   1.90


--- kdebase/kcontrol/screensaver/scrnsave.cpp  #1.89:1.90
@@ -667,9 +667,20 @@ void KScreenSaver::slotScreenSaver(QList
     int i = 0, indx = -1;
     for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) {
-        if (saver->name() == item->text (0))
+        if ( item->parent() )
+        {
+            if (  item->parent()->text( 0 ) == saver->category() && saver->name() == item->text (0))
         {
             indx = i;
             break;
         }
+        }
+        else
+        {
+            if (  saver->name() == item->text (0) )
+            {
+                indx = i;
+                break;
+            }
+        }        
         i++;
     }


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