From 7b9283f215e17af2b6607dac5f6f51f0ad5f83b6 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sat, 8 Jan 2022 13:03:00 +0100
Subject: [PATCH] Render the menu even when the request is routed to a child.

---
 HEADS             |  2 +-
 app/ccms_root.cpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/HEADS b/HEADS
index 7086549..3780580 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"master": "bf7948be474d712cceca1694081a14d75f7bc062"}}
\ No newline at end of file
+{"engine": {"master": "7dc547b022f081470a22e78edb4dd1d49d230ea2"}}
\ No newline at end of file
diff --git a/app/ccms_root.cpp b/app/ccms_root.cpp
index 445ce32..35f509c 100644
--- a/app/ccms_root.cpp
+++ b/app/ccms_root.cpp
@@ -37,9 +37,15 @@ void CCMSRoot::handle_request_main(Request *request) {
 		return;
 	}
 
-	if (!try_route_request_to_children(request)) {
+	WebNode *handler = get_request_handler_child(request);
+
+	if (!handler) {
 		request->send_error(404);
+		return;
 	}
+
+	add_menu(request);
+	handler->handle_request_main(request);
 }
 
 bool CCMSRoot::is_logged_in(Request *request) {
@@ -82,7 +88,7 @@ void CCMSRoot::setup_middleware() {
 	// _middlewares.push_back(Ref<RBACUserSessionSetupMiddleware>(new RBACUserSessionSetupMiddleware()));
 	_middlewares.push_back(Ref<RBACDefaultUserSessionSetupMiddleware>(new RBACDefaultUserSessionSetupMiddleware()));
 
-	//WebRoot::setup_middleware();
+	// WebRoot::setup_middleware();
 }
 
 void CCMSRoot::migrate() {