Merge branch 'feature/upstream' into develop

1 files changed, 4 insertions, 0 deletions

diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 0624b41..3bf7b37 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -1044,6 +1044,10 @@ public class PhotoMetadata : MediaMetadata {
     
     public override string? get_comment() {
         var comment = get_first_string_interpreted (COMMENT_TAGS);
+        if (comment == null) {
+            return comment;
+        }
+        
         try {
             var re = new Regex("^charset=\\w+\\s*");
             return re.replace(comment, -1, 0, "", RegexMatchFlags.DEFAULT);