From c03004341a31971fcc926675a6ba306867721e15 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Tue, 1 Aug 2017 12:19:14 +0200 Subject: app: handle failure to load layout.json gracefully Signed-off-by: Marcus Fritzsch --- src/app.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/app.cpp b/src/app.cpp index 5ddcb8c..0bf4529 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -99,11 +99,20 @@ App::App(wl::display *d) display{d}, controller{}, outputs(), - layouts(load_layout("../layout.json").unwrap()), + layouts(), //load_layout("../layout.json").unwrap()), surface2layer(load_layer_ids("../ids.json").unwrap()) { // layouts(load_layout("../layout.json").unwrap()) { assert(g_app == nullptr); g_app = this; + + try { + auto l = load_layout("../layout.json"); + if (l.is_err()) { + logerror("Coult not load layout configuration: %s", l.err().value()); + } + } catch (std::exception &e) { + logerror("Coult not load layout configuration: %s", e.what()); + } } App::~App() { g_app = nullptr; } -- cgit 1.2.3-korg