Merge branch 'develop' into impl/webchimera

develop
Icedream 2015-10-27 22:30:02 +01:00
commit e923f80333
1 changed files with 2 additions and 2 deletions

View File

@ -211,10 +211,10 @@ module.exports = class SettingsFile
select: () -> select: () ->
settingsObj.defaultIdentity = @id settingsObj.defaultIdentity = @id
update: () -> update: () ->
@log.silly "Requested update of #{id.id}" settingsObj.log.silly "Requested update of #{id.id}"
for own index, identity of settingsObj.identities for own index, identity of settingsObj.identities
if identity.id == id.id if identity.id == id.id
@log.silly "Updating identity #{id.id}" settingsObj.log.silly "Updating identity #{id.id}"
settingsObj.identities[index] = merge identity, id settingsObj.identities[index] = merge identity, id
return return
remove: () -> remove: () ->