Merge branch 'master' into mathmerge

2020-08-20 20:33:43 +02:00
parent 0b448b500d 7575e143f6
commit bf60a4e9fc
808 changed files with 18173 additions and 5666 deletions
--- a/Content.Server/Preferences/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/ServerPreferencesManager.cs
@@ -50,11 +50,11 @@ namespace Content.Server.Preferences
            {
                case "sqlite":
                    var configPreferencesDbPath = _configuration.GetCVar<string>("database.prefs_sqlite_dbpath");
-                    var finalPreferencesDbPath =
+                    var inMemory = _resourceManager.UserData.RootDir == null;
+                    var finalPreferencesDbPath = inMemory ?
+                        null :
                        Path.Combine(_resourceManager.UserData.RootDir, configPreferencesDbPath);
-                    dbConfig = new SqliteConfiguration(
-                        finalPreferencesDbPath
-                    );
+                    dbConfig = new SqliteConfiguration(finalPreferencesDbPath);
                    break;
                case "postgres":
                    dbConfig = new PostgresConfiguration(