gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved error handling in case of errors during initial tabs loading

Browse Source
This commit is contained in:
zadam 2022-12-14 10:00:33 +01:00
parent 173b28062e
commit 587387dd46
1 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/app/components/tab_manager.js
View File

@ -48,6 +48,7 @@ export default class TabManager extends Component {
} }
async loadTabs() { async loadTabs() {
try {
const tabsToOpen = appContext.isMainWindow const tabsToOpen = appContext.isMainWindow
? (options.getJson('openTabs') || []) ? (options.getJson('openTabs') || [])
: []; : [];
@ -66,8 +67,8 @@ export default class TabManager extends Component {
continue; continue;
} }
if (!froca.getNoteFromCache(openTab.hoistedNoteId)) { if (!(openTab.hoistedNoteId in froca.notes)) {
continue; openTab.hoistedNoteId = 'root';
} }
filteredTabs.push(openTab); filteredTabs.push(openTab);
@ -104,6 +105,13 @@ export default class TabManager extends Component {
await appContext.tabManager.switchToNoteContext(ntxId, notePath); await appContext.tabManager.switchToNoteContext(ntxId, notePath);
} }
} }
catch (e) {
logError(`Loading tabs '${options.get('openTabs')}' failed: ${e.message}`);
// try to recover
await this.openEmptyTab();
}
}
noteSwitchedEvent({noteContext}) { noteSwitchedEvent({noteContext}) {
if (noteContext.isActive()) { if (noteContext.isActive()) {