mirror of
https://github.com/davatorium/rofi.git
synced 2025-03-10 17:06:37 -04:00
Be more diligent trying to resolve -config
This commit is contained in:
parent
f9491690fd
commit
d8e9a1981f
1 changed files with 13 additions and 4 deletions
|
@ -1067,10 +1067,19 @@ int main(int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config_path) {
|
if (config_path) {
|
||||||
if (rofi_theme_parse_file(config_path)) {
|
// Try to resolve the path.
|
||||||
rofi_theme_free(rofi_theme);
|
extern const char *rasi_theme_file_extensions[];
|
||||||
rofi_theme = NULL;
|
char *file2 =
|
||||||
|
helper_get_theme_path(config_path, rasi_theme_file_extensions, NULL);
|
||||||
|
char *filename = rofi_theme_parse_prepare_file(file2);
|
||||||
|
g_free(file2);
|
||||||
|
if (filename && g_file_test(filename, G_FILE_TEST_EXISTS)) {
|
||||||
|
if (rofi_theme_parse_file(filename)) {
|
||||||
|
rofi_theme_free(rofi_theme);
|
||||||
|
rofi_theme = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
g_free(filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
find_arg_str("-theme", &(config.theme));
|
find_arg_str("-theme", &(config.theme));
|
||||||
|
@ -1093,7 +1102,7 @@ int main(int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rofi_theme == NULL || rofi_theme->num_widgets == 0) {
|
if (rofi_theme == NULL || rofi_theme->num_widgets == 0) {
|
||||||
g_warning("Failed to load theme. Try to load default: ");
|
g_debug("Failed to load theme. Try to load default: ");
|
||||||
rofi_theme_parse_string("@theme \"default\"");
|
rofi_theme_parse_string("@theme \"default\"");
|
||||||
}
|
}
|
||||||
TICK_N("Load cmd config ");
|
TICK_N("Load cmd config ");
|
||||||
|
|
Loading…
Add table
Reference in a new issue