Merge branch 'v0.22.x'

2021-05-26 11:57:41 +02:00
parent 8a9d678bac 7a6823dcdf
commit d2bd12822f
9 changed files with 92 additions and 39 deletions
@@ -21,6 +21,7 @@
 #include "Sticker.hxx"
 #include "lib/sqlite/Util.hxx"
 #include "fs/Path.hxx"
+#include "fs/NarrowPath.hxx"
 #include "Idle.hxx"
 #include "util/StringCompare.hxx"
 #include "util/ScopeExit.hxx"
@@ -82,7 +83,7 @@ static const char sticker_sql_create[] =
 	"";

 StickerDatabase::StickerDatabase(Path path)
-	:db(path.c_str())
+	:db(NarrowPath(path))
 {
 	assert(!path.IsNull());