self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-17 18:44:45 +02:00
Code Issues Releases Activity

Desktop: Fixes #3461: Fixed regression which could cause a crash after deleting a notebook

Browse Source
This commit is contained in:
Laurent Cozic 2020-07-07 19:16:33 +01:00
parent 8732c97dcd
commit 24bc7f153a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ElectronClient/gui/NoteToolbar/NoteToolbar.tsx
View File

@ -40,6 +40,8 @@ function NoteToolbar(props:NoteToolbarProps) {
const styles = styles_(props); const styles = styles_(props);
const [toolbarItems, setToolbarItems] = useState([]); const [toolbarItems, setToolbarItems] = useState([]);
const selectedNoteFolder = Folder.byId(props.folders, props.note.parent_id); const selectedNoteFolder = Folder.byId(props.folders, props.note.parent_id);
const folderId = selectedNoteFolder ? selectedNoteFolder.id : '';
const folderTitle = selectedNoteFolder ? selectedNoteFolder.title : '';
const cmdService = CommandService.instance(); const cmdService = CommandService.instance();
@ -54,14 +56,14 @@ function NoteToolbar(props:NoteToolbarProps) {
cmdService.commandToToolbarButton('historyForward') cmdService.commandToToolbarButton('historyForward')
); );
if (selectedNoteFolder.id && ['Search', 'Tag', 'SmartFilter'].includes(props.notesParentType)) { if (folderId && ['Search', 'Tag', 'SmartFilter'].includes(props.notesParentType)) {
output.push({ output.push({
title: _('In: %s', substrWithEllipsis(selectedNoteFolder.title, 0, 16)), title: _('In: %s', substrWithEllipsis(folderTitle, 0, 16)),
iconName: 'fa-book', iconName: 'fa-book',
onClick: () => { onClick: () => {
props.dispatch({ props.dispatch({
type: 'FOLDER_AND_NOTE_SELECT', type: 'FOLDER_AND_NOTE_SELECT',
folderId: selectedNoteFolder.id, folderId: folderId,
noteId: props.note.id, noteId: props.note.id,
}); });
}, },
@ -81,7 +83,7 @@ function NoteToolbar(props:NoteToolbarProps) {
output.push(cmdService.commandToToolbarButton('setTags')); output.push(cmdService.commandToToolbarButton('setTags'));
setToolbarItems(output); setToolbarItems(output);
}, [props.note.id, selectedNoteFolder.id, selectedNoteFolder.title, props.watchedNoteFiles, props.notesParentType]); }, [props.note.id, folderId, folderTitle, props.watchedNoteFiles, props.notesParentType]);
useEffect(() => { useEffect(() => {
updateToolbarItems(); updateToolbarItems();