[Kde-imaging] [Bug 91545] 'Slideshow' does nothing if an album only contains subalbums, but no images directly or is empty

[Angelo Naselli]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=91545         
anaselli linux it changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From anaselli linux it  2006-09-19 11:43 -------
SVN commit 586270 by anaselli:

patch provided by  drajar <djarca73 at yahoo dot com>
Tested by Gilles 
BUG: 91545

 M  +10 -0     plugin_slideshow.cpp  


--- trunk/extragear/libs/kipi-plugins/slideshow/plugin_slideshow.cpp #586269:586270
 @ -187,7 +187,17  @
     if (showSelectedFilesOnly)
         urlList = interface->currentSelection().images();
     else
+    {
+        KURL currentPath = interface->currentAlbum().path();
+        QValueList<KIPI::ImageCollection> albumList;
+        albumList = interface->allAlbums();
+        QValueList<KIPI::ImageCollection>::iterator it;
+
         urlList = interface->currentAlbum().images();
+        for ( it = albumList.begin(); it != albumList.end(); ++it )
+            if (currentPath.isParentOf((*it).path()) && !((*it).path() == currentPath))
+                urlList += (*it).images();
+    }
 
     if ( urlList.isEmpty() )
     {