diff --git a/public/javascripts/messaging.js b/public/javascripts/messaging.js index 18a655cb6..6ee4e47b9 100644 --- a/public/javascripts/messaging.js +++ b/public/javascripts/messaging.js @@ -5,7 +5,8 @@ const messaging = (function() { let ws = null; function logError(message) { - console.trace(message); + console.log(message); // needs to be separate from .trace() + console.trace(); if (ws && ws.readyState === 1) { ws.send(JSON.stringify({ diff --git a/public/javascripts/note_tree.js b/public/javascripts/note_tree.js index d6a950902..24e29da57 100644 --- a/public/javascripts/note_tree.js +++ b/public/javascripts/note_tree.js @@ -412,6 +412,13 @@ const noteTree = (function() { setExpandedToServer(data.node.data.note_tree_id, false); }, init: (event, data) => { + const noteId = treeUtils.getNoteIdFromNotePath(startNotePath); + + if (noteIdToTitle[noteId] === undefined) { + // note doesn't exist so don't try to activate it + startNotePath = null; + } + if (startNotePath) { activateNode(startNotePath); } diff --git a/services/sync.js b/services/sync.js index c3c05452c..1b0cf2b4f 100644 --- a/services/sync.js +++ b/services/sync.js @@ -265,7 +265,7 @@ async function checkContentHash(syncContext) { for (const key in hashes) { if (hashes[key] !== resp.hashes[key]) { - allChecksPassed = true; + allChecksPassed = false; await event_log.addEvent(`Content hash check for ${key} FAILED. Local is ${hashes[key]}, remote is ${resp.hashes[key]}`);