mirror of
https://github.com/BoostIo/Boostnote
synced 2025-12-14 10:16:26 +00:00
Merge branch 'dev'
* dev: 0.4.0-beta.2 tutorial 追加 ModeSelect 行動データ, contact form, default articleに英語文追加, Intro fix Hotkey settingの時Alertで結果を出す Folder nameが長すぎ雨時のlayout崩れ解決 ArticleNavigatorの余計なスペースをなくす Default articleの誤字直し Cmd+Sで保存 debug craetedAt fix Title overflow behaviour 0.4.0-beta.1 Conflicts: package.json
This commit is contained in:
6
main.js
6
main.js
@@ -138,8 +138,12 @@ app.on('ready', function () {
|
||||
}
|
||||
finderWindow.show()
|
||||
})
|
||||
mainWindow.webContents.send('APP_SETTING_DONE', {})
|
||||
} catch (err) {
|
||||
console.log(err.name)
|
||||
console.error(err)
|
||||
mainWindow.webContents.send('APP_SETTING_ERROR', {
|
||||
message: 'Failed to apply hotkey: Invalid format'
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user