Skip to content

Commit

Permalink
#3405 Fix sync old version data issue
Browse files Browse the repository at this point in the history
  • Loading branch information
zxdong262 committed May 19, 2024
1 parent 4146d2f commit ef1a57a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/app/lib/command-line.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ electerm -bo "/home/root/works.csv"
.option('-pw, --password <password>', 'specify ssh server password')
.option('-se, --set-env <setEnv>', 'specify envs')
.option('-so, --sftp-only', 'only show sftp panel')
.option('-d, --init-folder', 'init folder got init terminal')
.exitOverride()

try {
Expand Down
10 changes: 7 additions & 3 deletions src/client/store/sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,13 @@ export default (Store) => {
for (const n of names) {
let str = get(gist, `files["${n}.json"].content`)
if (!str) {
store.isSyncingSetting = false
store.isSyncDownload = false
throw new Error(('Seems you have a empty gist, you can try use existing gist ID or upload first'))
if (n === settingMap.bookmarks) {
store.isSyncingSetting = false
store.isSyncDownload = false
throw new Error(('Seems you have a empty gist, you can try use existing gist ID or upload first'))
} else {
continue
}
}
if (!isJSON(str)) {
str = await window.pre.runGlobalAsync('decryptAsync', str, pass)
Expand Down

0 comments on commit ef1a57a

Please sign in to comment.