diff --git a/electron.js b/electron.js index ab70a1e41..c2525639d 100644 --- a/electron.js +++ b/electron.js @@ -21,26 +21,6 @@ let mainWindow; require('electron-dl')({ saveAs: true }); -// contextMenu({ -// menu: (actions, params, browserWindow) => [ -// actions.cut(), -// actions.copy(), -// actions.copyLink(), -// actions.paste(), -// { -// label: 'Search DuckDuckGo for “{selection}”', -// // Only show it when right-clicking text -// visible: params.selectionText.trim().length > 0, -// click: () => { -// const {shell} = require('electron'); -// -// shell.openExternal(`https://duckduckgo.com?q=${encodeURIComponent(params.selectionText)}`); -// } -// }, -// actions.inspect() -// ] -// }); - function onClosed() { // Dereference the window // For multiple windows store them in an array @@ -104,6 +84,9 @@ app.on('window-all-closed', () => { if (process.platform !== 'darwin') { app.quit(); } + else if (process.platform === 'win32') { + app.exit(0); // attempt to fix the issue when app.quite() won't terminate processes on windows + } }); app.on('activate', () => { diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index 12d82a48c..2baae1c7b 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -732,6 +732,7 @@ div[data-notify="container"] { .fancytree-loading span.fancytree-expander:after { content: " "; + color: inherit !important; display: block; border-radius: 50%; border-color: #000 transparent #000 transparent; diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js index 520d1cdf9..d0c2dfc73 100644 --- a/src/services/consistency_checks.js +++ b/src/services/consistency_checks.js @@ -370,7 +370,8 @@ async function findLogicIssues() { async ({noteRevisionId}, autoFix) => { if (autoFix) { const noteRevision = await repository.getNoteRevision(noteRevisionId); - await noteRevision.setContent(''); + noteRevision.isErased = true; + await noteRevision.save(); logFix(`Note revision ${noteRevisionId} content was set to empty string since it was null even though it is not erased`); }