diff options
author | Yuta Doi <yuta-d@witz-inc.co.jp> | 2017-11-10 11:42:36 +0900 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-11-10 11:57:08 +0000 |
commit | 0b1d9ca2550bdb877d065a74e4debcc95c4e7b98 (patch) | |
tree | 5aafb6e7fa8c6cfac071038fd21088e895c1e34b /src/app.cpp | |
parent | 2b97202f86c492be91de83a93b513384871f321d (diff) |
Add the fail-safe process for the configuration file
If the configuration file "layers.json" can not be opened,
windowmanager uses a default layer configuration.
Change-Id: I1b20f385c5e748a90be5e930a1775a6b3a4f39a5
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'src/app.cpp')
-rw-r--r-- | src/app.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/app.cpp b/src/app.cpp index ba258b5..af552b5 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -44,12 +44,16 @@ namespace { using nlohmann::json; result<json> file_to_json(char const *filename) { + json j; std::ifstream i(filename); if (i.fail()) { - return Err<json>("Could not open config file"); + HMI_DEBUG("wm", "Could not open config file, so use default layer information"); + j = default_layers_json; } - json j; - i >> j; + else { + i >> j; + } + return Ok(j); } |