Merge branch 'master' into develop

8 years ago · 022823f57c
parent 58cbf44143 039f80c5aa
commit 022823f57c
1 changed files with 1 additions and 1 deletions
--- a/src/upgrade.js
+++ b/src/upgrade.js
@ -430,7 +430,7 @@ Upgrade.upgrade = function (callback) {
 						var keys = ['chat-incoming', 'chat-outgoing', 'notification'];
 						db.getObject('settings:sounds', function (err, settings) {
-							if (err) {
+							if (err || !settings) {
 								return cb(err);
 							}