From 210cc61ee4191465805a770881235c677041f929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sun, 8 Mar 2026 11:11:07 +0100
Subject: New upstream version 0.32.15

---
 src/db/DatabaseTable.vala | 2 +-
 src/db/Db.vala            | 8 ++++++--
 src/db/VideoTable.vala    | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/db')

diff --git a/src/db/DatabaseTable.vala b/src/db/DatabaseTable.vala
index be45e5e..5d84df2 100644
--- a/src/db/DatabaseTable.vala
+++ b/src/db/DatabaseTable.vala
@@ -57,7 +57,7 @@ public abstract class DatabaseTable {
             re = regex_map[pattern];
         } else {
             try {
-                re = new Regex(pattern, RegexCompileFlags.DEFAULT, RegexMatchFlags.DEFAULT);
+                re = new Regex(pattern, 0, 0);
                 regex_map[pattern] = re;
             } catch (Error err) {
                 context.result_error("Invalid pattern: %s".printf(err.message), Sqlite.ERROR);
diff --git a/src/db/Db.vala b/src/db/Db.vala
index 7f76f2d..e537ee0 100644
--- a/src/db/Db.vala
+++ b/src/db/Db.vala
@@ -56,8 +56,12 @@ public VerifyResult verify_database(out string app_version, out int schema_versi
             return result;
     }
 
-    PhotoTable.clean_comments();
-    VideoTable.clean_comments();
+    try {
+        PhotoTable.clean_comments();
+        VideoTable.clean_comments();
+    } catch (DatabaseError err) {
+        debug("Ignoring database error while clean ing comments: %s", err.message);
+    }
 
     
     return VerifyResult.OK;
diff --git a/src/db/VideoTable.vala b/src/db/VideoTable.vala
index 67c50ba..753e02a 100644
--- a/src/db/VideoTable.vala
+++ b/src/db/VideoTable.vala
@@ -158,6 +158,8 @@ public class VideoTable : DatabaseTable {
         if (res != Sqlite.DONE) {
             if (res != Sqlite.CONSTRAINT)
                 throw_error("VideoTable.add", res);
+
+            return VideoID();
         }
         
         // fill in ignored fields with database values
-- 
cgit v1.2.3