diff --git a/cexif.cpp b/cexif.cpp index 440de17..922c96c 100644 --- a/cexif.cpp +++ b/cexif.cpp @@ -342,7 +342,7 @@ QString cEXIF::cameraModel() QDateTime cEXIF::dateTime() { - QDateTime dateTime = QDateTime::fromString(getEXIFTag(0x0132, 1).value(), "yyyy:MM:dd hh:mm:ss"); + QDateTime dateTime = QDateTime::fromString(getEXIFTag(0x9004, 1).value(), "yyyy:MM:dd hh:mm:ss"); if(dateTime.isValid()) return(dateTime); @@ -350,6 +350,10 @@ QDateTime cEXIF::dateTime() if(dateTime.isValid()) return(dateTime); + dateTime = QDateTime::fromString(getEXIFTag(0x0132, 1).value(), "yyyy:MM:dd hh:mm:ss"); + if(dateTime.isValid()) + return(dateTime); + QFileInfo info(m_szFileName); return(info.lastModified()); } diff --git a/cmainwindow.cpp b/cmainwindow.cpp index ad0344d..d40c869 100644 --- a/cmainwindow.cpp +++ b/cmainwindow.cpp @@ -260,7 +260,11 @@ void cMainWindow::loadData(bool bProgressBar) m_tagList.load(m_lpSplashScreen, bProgressBar ? m_lpProgressBar : nullptr); m_pictureList.clear(); + if(bProgressBar) + m_lpProgressBar->setVisible(true); m_pictureList.load(m_personList, m_locationList, m_tagList, m_lpSplashScreen, bProgressBar ? m_lpProgressBar : nullptr); + if(bProgressBar) + m_lpProgressBar->setVisible(false); displayData(); @@ -591,7 +595,7 @@ void cMainWindow::onFileOpen() if(!m_pictureLibrary.openDatabase(szPath)) return; - loadData(m_lpProgressBar); + loadData(true); setCurrentFile(szPath); m_szOldPath = szPath;