diff options
Diffstat (limited to 'src/window_manager.cpp')
| -rw-r--r-- | src/window_manager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 4e41d40..bb8b073 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -126,19 +126,19 @@ WindowManager::WindowManager(wl::display *d) id_alloc{}, pending_events(false) { - char const *path_layers_json = getenv("AFM_APP_INSTALL_DIR"); - string path; - if (!path_layers_json) + const char *path = getenv("AFM_APP_INSTALL_DIR"); + string lm_setting_path = path; + if (!path) { HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); - path = string(path_layers_json); } else { - path = string(path_layers_json) + string("/etc/layers.json"); + lm_setting_path += "/etc/layers_setting.json"; } + this->lm = std::make_shared<LayoutManager>(lm_setting_path); - try +/* try { { auto l = load_layer_map(path.c_str()); @@ -155,7 +155,7 @@ WindowManager::WindowManager(wl::display *d) catch (std::exception &e) { HMI_ERROR("wm", "Loading of configuration failed: %s", e.what()); - } + } */ } int WindowManager::init() |