database: don't load database after charset was reconfigured

When you change the filesystem charset, discard the old database file and create a new one. The old database file will most likely contain stale or invalid information.

database: don't load database after charset was reconfigured
d55f6b53 · Max Kellermann · a2ce6e5b · d55f6b53
Commit d55f6b53 authored Feb 12, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

database.c src/database.c +4 -6

No files found.
--- a/src/database.c
+++ b/src/database.c
@@ -315,13 +315,11 @@ db_load(void)
 			tempCharset = path_get_fs_charset();
 			if (tempCharset != NULL
 			    && strcmp(fsCharset, tempCharset)) {
-				g_message("Using \"%s\" for the "
-					  "filesystem charset "
+				g_message("Existing database has charset \"%s\" "
 					  "instead of \"%s\"; "
-					  "maybe you need to "
-					  "recreate the db?",
-					fsCharset, tempCharset);
-				path_set_fs_charset(fsCharset);
+					  "discarding database file",
+					  fsCharset, tempCharset);
+				return false;
 			}
 		} else
 			g_error("unknown line in db info: %s",