From 40247a591e9ee5c97878541f6448cd2f8481a857 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 15 Mar 2020 22:09:48 +0100
Subject: [PATCH] fix delete shortcut in note tree and protect notes
 recursively

---
 src/public/javascripts/widgets/note_tree.js | 2 +-
 src/services/notes.js                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/javascripts/widgets/note_tree.js
index b018cb132..ba04363be 100644
--- a/src/public/javascripts/widgets/note_tree.js
+++ b/src/public/javascripts/widgets/note_tree.js
@@ -652,7 +652,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         
         for (const action of actions) {
             for (const shortcut of action.effectiveShortcuts) {
-                hotKeyMap[shortcut] = node => this.triggerCommand(action.actionName, {node}); 
+                hotKeyMap[utils.normalizeShortcut(shortcut)] = node => this.triggerCommand(action.actionName, {node});
             }
         }
 
diff --git a/src/services/notes.js b/src/services/notes.js
index 383398af5..52bc83099 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -193,7 +193,7 @@ async function protectNoteRecursively(note, protect, includingSubTree, taskConte
 
     if (includingSubTree) {
         for (const child of await note.getChildNotes()) {
-            await protectNoteRecursively(child, protect, taskContext);
+            await protectNoteRecursively(child, protect, includingSubTree, taskContext);
         }
     }
 }