[Digikam-devel] [Bug 129450] cannot exit preview mode within empty album

[Gilles Caulier]

------- 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=129450         




------- Additional Comments From caulier.gilles free fr  2006-06-20 18:01 -------
SVN commit 553282 by cgilles:

digikam from trunk : fix image preview mode rules with empty album (4)
CCBUGS: 129450

 M  +2 -8      albumwidgetstack.cpp  
 M  +3 -1      digikamview.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumwidgetstack.cpp #553281:553282
 @ -137,16 +137,10  @
 void AlbumWidgetStack::setPreviewItem(const QString& path)
 {
     if (path.isNull())
-    {
-        d->previewItemWidget->setImagePath();
         slotPreviewFailed();
-    }
     
-    if (previewMode() == PreviewItemMode)
-    {
-        visibleWidget()->setFocus();
-        d->previewItemWidget->setImagePath(path);
-    }
+    visibleWidget()->setFocus();
+    d->previewItemWidget->setImagePath(path);
 }
 
 int AlbumWidgetStack::previewMode(void)
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #553281:553282
 @ -769,7 +769,6  @
 {
     if (d->albumPreviews->previewMode() == AlbumWidgetStack::PreviewAlbumMode)
     {
-        d->albumPreviews->setPreviewItem();
         d->albumPreviews->setPreviewMode( AlbumWidgetStack::PreviewItemMode );
         AlbumIconItem *item=0;
 
 @ -777,7 +776,10  @
         {
             item = d->iconView->firstSelectedItem();
             if (!item) 
+            {
+                d->albumPreviews->setPreviewItem();
                 return;
+            }
         }
         else
         {