ignore all-whitespace Exif comments

sylikc · Jun 21, 2023 · 2ce3887 · 2ce3887
1 parent 6fab641
commit 2ce3887
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/JPEGView/EXIFDisplayCtl.cpp b/src/JPEGView/EXIFDisplayCtl.cpp
@@ -121,7 +121,7 @@ void CEXIFDisplayCtl::FillEXIFDataDisplay() {
 		CRawMetadata* pRawMetaData = CurrentImage()->GetRawMetadata();
 		if (pEXIFReader != NULL) {
 			sComment = pEXIFReader->GetUserComment();
-			if (sComment == NULL || sComment[0] == 0) {
+			if (sComment == NULL || sComment[0] == 0 || ((std::wstring) sComment).find_first_not_of(L" \t\n\r\f\v", 0) == std::wstring::npos) {
 				sComment = pEXIFReader->GetImageDescription();
 			}
 			if (pEXIFReader->GetAcquisitionTimePresent()) {
@@ -201,7 +201,7 @@ void CEXIFDisplayCtl::FillEXIFDataDisplay() {
 		}
 	}
 
-	if (sComment == NULL || sComment[0] == 0) {
+	if (sComment == NULL || sComment[0] == 0 || ((std::wstring)sComment).find_first_not_of(L" \t\n\r\f\v", 0) == std::wstring::npos) {
 		sComment = CurrentImage()->GetJPEGComment();
 	}
 	if (CSettingsProvider::This().ShowJPEGComments() && sComment != NULL && sComment[0] != 0) {