Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-21 15:49:56 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into m41

Browse Source 
# Conflicts:
#	src/public/javascripts/mobile.js
#	src/public/stylesheets/style.css
This commit is contained in:
zadam
2020-02-25 09:42:27 +01:00
parent 7cac2521ef e8a9e49e9e
commit 36eac6badd
11 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electron.js
View File

@@ -26,9 +26,9 @@ app.on('ready', async () => {
await sqlInit.dbConnection;
// if schema doesn't exist -> setup process
// if schema exists, then we need to wait until the migration process is finished
if (await sqlInit.schemaExists()) {
// if db is not initialized -> setup process
// if db is initialized, then we need to wait until the migration process is finished
if (await sqlInit.isDbInitialized()) {
await sqlInit.dbReady;
await windowService.createMainWindow();