From a0594dcc2b0816d779b7dee7cc25ec7f4045ffc9 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Thu, 12 Aug 2021 21:49:06 +0800
Subject: [PATCH] Searcher: catch exception when loading node

---
 src/search/searcher.cpp              | 11 ++++++++++-
 src/widgets/notebooknodeexplorer.cpp |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/search/searcher.cpp b/src/search/searcher.cpp
index 0189fc97..e5f22b3f 100644
--- a/src/search/searcher.cpp
+++ b/src/search/searcher.cpp
@@ -5,6 +5,7 @@
 
 #include <buffer/buffer.h>
 #include <core/file.h>
+#include <core/exception.h>
 #include <notebook/node.h>
 #include <notebook/notebook.h>
 
@@ -348,7 +349,15 @@ bool Searcher::firstPhaseSearchFolder(Node *p_node, QVector<SearchSecondPhaseIte
     Q_ASSERT(p_node->isContainer());
     Q_ASSERT(testTarget(SearchTarget::SearchFile) || testTarget(SearchTarget::SearchFolder));
 
-    p_node->load();
+    try {
+        p_node->load();
+    } catch (Exception &p_e) {
+        QString msg = tr("Failed to load node to search (%1) (%2).")
+                        .arg(p_node->getName(), p_e.what());
+        qCritical() << msg;
+        emit logRequested(msg);
+        return false;
+    }
 
     if (testTarget(SearchTarget::SearchFolder)) {
         const auto name = p_node->getName();
diff --git a/src/widgets/notebooknodeexplorer.cpp b/src/widgets/notebooknodeexplorer.cpp
index 16aa043c..126a378d 100644
--- a/src/widgets/notebooknodeexplorer.cpp
+++ b/src/widgets/notebooknodeexplorer.cpp
@@ -10,7 +10,7 @@
 #include <notebook/notebook.h>
 #include <notebook/node.h>
 #include <notebook/externalnode.h>
-#include "exception.h"
+#include <core/exception.h>
 #include "messageboxhelper.h"
 #include "vnotex.h"
 #include "mainwindow.h"