system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-21 10:44:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config: Don't crash if we don't have a config file

Browse source 
Adding a check in weston_config_full_path so that
we don't crash if we started without a config file.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
This commit is contained in:
Alexandru DAMIAN 2013-09-26 10:27:16 +01:00 committed by Kristian Høgsberg
parent 7b8e970ad1
commit 5f42930a41
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shared/config-parser.c
View file

@ -385,7 +385,7 @@ weston_config_parse(const char *name)
const char *
weston_config_get_full_path(struct weston_config *config)
{
return config->path;
return config == NULL ? NULL : config->path;
}
int

8
src/compositor.c
View file

@ -3492,8 +3492,12 @@ int main(int argc, char *argv[])
}
config = weston_config_parse("weston.ini");
weston_log("Using config file '%s'\n",
weston_config_get_full_path(config));
if (config != NULL) {
weston_log("Using config file '%s'\n",
weston_config_get_full_path(config));
} else {
weston_log("Starting with no config file.\n");
}
section = weston_config_get_section(config, "core", NULL, NULL);
weston_config_section_get_string(section, "modules", &modules, "");