Code Review
/
apps
/
agl-service-windowmanager-2017.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add the fail-safe process for the configuration file
[apps/agl-service-windowmanager-2017.git]
/
src
/
app.cpp
diff --git
a/src/app.cpp
b/src/app.cpp
index
ba258b5
..
af552b5
100644
(file)
--- a/
src/app.cpp
+++ b/
src/app.cpp
@@
-44,12
+44,16
@@
namespace {
using nlohmann::json;
result<json> file_to_json(char const *filename) {
using nlohmann::json;
result<json> file_to_json(char const *filename) {
+ json j;
std::ifstream i(filename);
if (i.fail()) {
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);
}
return Ok(j);
}