Browse Source

fix setting migrator

valkyr1e 8 years ago
parent
commit
959d2c096a
2 changed files with 4 additions and 4 deletions
  1. 1 1
      manifest.json
  2. 3 3
      settings_migrator.js

+ 1 - 1
manifest.json

@@ -2,7 +2,7 @@
 	"files": {
 	"files": {
 		"index.js": "04e9791028af0cb91f75add22817dfbc0384653732c4ccd222df2f316539bdd4",
 		"index.js": "04e9791028af0cb91f75add22817dfbc0384653732c4ccd222df2f316539bdd4",
 		"module.json": "70814af508e14fa5a0a33e2a3dbab0bb0ad521201d43ed681b5d15f1e84cf2ee",
 		"module.json": "70814af508e14fa5a0a33e2a3dbab0bb0ad521201d43ed681b5d15f1e84cf2ee",
-		"settings_migrator.js": "2cdf1beba9470c6e7237b9d72a9bc17328125f986dcaaf9d1f7ffd86e2a1b705"
+		"settings_migrator.js": "9a64ce3b6239831d18d28fabbf2c8d55cf9f70b2e63a8e3a8b075039bfae38b9"
 	},
 	},
 	"defs": {
 	"defs": {
 		"C_PLAYER_LOCATION": 5,
 		"C_PLAYER_LOCATION": 5,

+ 3 - 3
settings_migrator.js

@@ -13,17 +13,17 @@ const DefaultSettings = {
 module.exports = function MigrateSettings(from_ver, to_ver, settings) {
 module.exports = function MigrateSettings(from_ver, to_ver, settings) {
     if (from_ver === undefined) {
     if (from_ver === undefined) {
         // Migrate legacy config file
         // Migrate legacy config file
-        return DefaultSettings;
+        return Object.assign(Object.assign({}, DefaultSettings), settings);
     } else if (from_ver === null) {
     } else if (from_ver === null) {
         // No config file exists, use default settings
         // No config file exists, use default settings
         return DefaultSettings;
         return DefaultSettings;
     } else {
     } else {
-        if(from + 1 < to) {
+        if (from_ver + 1 < to_ver) {
             settings = MigrateSettings(from_ver, from_ver + 1, settings);
             settings = MigrateSettings(from_ver, from_ver + 1, settings);
             return MigrateSettings(from_ver + 1, to_ver, settings);
             return MigrateSettings(from_ver + 1, to_ver, settings);
         }
         }
 
 
-        switch (to) {
+        switch (to_ver) {
             default:
             default:
                 settings = Object.assign(DefaultSettings, settings);
                 settings = Object.assign(DefaultSettings, settings);
                 break;
                 break;