[Digikam-devel] extragear/graphics/digikam/libs/widgets/metadata

[Gilles Caulier]

SVN commit 558432 by cgilles:

digikam from trunk : bugfix : clear all metadata contents properly in all metadata view before to update when a new picture is selected in main interface.

Note : with the old implementation, the bug can be reproduce like this : after to have selected a picture with metadata, if you select a new picture without metadata, nothing will be displayed. But if you change the level of details, the preview picture metadata will be displayed !

CCMAIL: digikam-devel at kde.org

 M  +6 -2      metadatawidget.cpp  


--- trunk/extragear/graphics/digikam/libs/widgets/metadata/metadatawidget.cpp #558431:558432
@@ -136,6 +136,8 @@
     d->view = new MetadataListView(this);
     d->mainLayout->addMultiCellWidget(d->view, 1, 1, 0, 4);
 
+    // -----------------------------------------------------------------
+    
     connect(d->levelButtons, SIGNAL(released(int)),
             this, SLOT(slotModeChanged(int)));
 
@@ -167,6 +169,9 @@
 bool MetadataWidget::setMetadata(const QByteArray& data)
 {
     d->metadata = data;
+    
+    // Cleanup all metadata contents.
+    setMetadataMap();
 
     if (d->metadata.isEmpty())
     {
@@ -175,8 +180,7 @@
         return false;
     }
 
-    // Cleanup all metadata contents and try to decode current metadata.
-    setMetadataMap();
+    // Try to decode current metadata.
     if (decodeMetadata())
         enabledToolButtons(true);
     else