Merge pull request #555 from digitallyinduced/dont-crash-if-layout-no…

…t-defined Don't crash if setLayout has not been called in the request lifecycle
digitallyinduced · Nov 18, 2020 · 51fccee · 51fccee
2 parents 1e67bc7 + 3b678d1
commit 51fccee
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/IHP/Controller/Render.hs b/IHP/Controller/Render.hs
@@ -44,7 +44,9 @@ renderHtml !view = do
     frozenContext <- Context.freeze ?context
 
     let ?context = frozenContext
-    let (ViewLayout layout) = Context.fromFrozenContext @ViewLayout
+    let layout = case Context.maybeFromFrozenContext @ViewLayout of
+            Just (ViewLayout layout) -> layout
+            Nothing -> id
 
     let boundHtml = let ?context = frozenContext in layout (ViewSupport.html ?view)
     pure boundHtml