tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-08 13:38:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to rescue if fetching sync storage failed in init.

Browse Source
This commit is contained in:
FelisCatus 2017-03-24 23:01:09 -04:00
parent f68c54fbae
commit 0a7f4fcdaf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
omega-target/src/options.coffee
View File

@ -126,7 +126,7 @@ class Options
@_state.get({'syncOptions': ''}).then ({syncOptions}) => @_state.get({'syncOptions': ''}).then ({syncOptions}) =>
return if syncOptions == 'conflict' return if syncOptions == 'conflict'
# Try to fetch options from sync storage. # Try to fetch options from sync storage.
return @sync.storage.get(null).then (options) => return @sync.storage.get(null).then((options) =>
if not options['schemaVersion'] if not options['schemaVersion']
@_state.set({'syncOptions': 'pristine'}) @_state.set({'syncOptions': 'pristine'})
return null return null
@ -135,6 +135,7 @@ class Options
@sync.enabled = true @sync.enabled = true
@log.log('Options#loadOptions::fromSync', options) @log.log('Options#loadOptions::fromSync', options)
options options
).catch(-> null)
else else
@log.error(e.stack) @log.error(e.stack)
# Some serious error happened when loading options. Disable syncing # Some serious error happened when loading options. Disable syncing