Merge branch 'develop' into upgrades-refactor

src/upgrades/sound_settings.js

@@ -20,15 +20,15 @@ module.exports = {
 			'waterdrop-low.mp3': 'Default | Water drop (low)',
 		};
 
-		async.parallel([
-			function (cb) {
-				var keys = ['chat-incoming', 'chat-outgoing', 'notification'];
-
 		db.getObject('settings:sounds', function (err, settings) {
 			if (err || !settings) {
-						return cb(err);
+				return callback(err);
 			}
 
+			async.parallel([
+				function (cb) {
+					var keys = ['chat-incoming', 'chat-outgoing', 'notification'];
+
 					keys.forEach(function (key) {
 						if (settings[key] && settings[key].indexOf(' | ') === -1) {
 							settings[key] = map[settings[key]] || '';
@@ -36,7 +36,6 @@ module.exports = {
 					});
 
 					meta.configs.setMultiple(settings, cb);
-				});
 				},
 				function (cb) {
 					var keys = ['notificationSound', 'incomingChatSound', 'outgoingChatSound'];
@@ -60,5 +59,6 @@ module.exports = {
 					}, cb);
 				},
 			], callback);
+		});
 	},
 };