Fallback to filename after all if no proper fileitem is available. Sorry, the code...

svn path=/trunk/KDE/kdebase/apps/; revision=798078

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 9d5ce0f6a83605e3f647d115e87ebcf491e5f607..c783252f756a0bd05262323d4fd1d881cc90a9be 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -261,7 +261,7 @@ void InfoSidebarPage::showItemInfo()
         connect(job, SIGNAL(failed(const KFileItem&)),
                 this, SLOT(showIcon(const KFileItem&)));
 
         connect(job, SIGNAL(failed(const KFileItem&)),
                 this, SLOT(showIcon(const KFileItem&)));
 

-        m_nameLabel->setText( !m_fileItem.isNull() && selectedItems.isEmpty() ? m_fileItem.text() : selectedItems[0].text() );
+        m_nameLabel->setText( !m_fileItem.isNull() && selectedItems.isEmpty() ? m_fileItem.text() : ( !selectedItems.isEmpty() ? selectedItems[0].text() : file.fileName() ) );

     }
 
     showMetaInfo();
     }
 
     showMetaInfo();