PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-07-31 21:59:25 -04:00
Code Releases Activity

check before xresource config file parsing if it exist

Browse source
This commit is contained in:
Dave Davenport 2020-04-19 16:24:13 +02:00
parent 4689e6ee6d
commit ed55b6c634
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/rofi.c
View file

@ -916,6 +916,7 @@ int main ( int argc, char *argv[] )
} }
// Load in config from X resources. // Load in config from X resources.
config_parse_xresource_options ( xcb ); config_parse_xresource_options ( xcb );
if ( config_path_new && g_file_test ( config_path_new, G_FILE_TEST_IS_REGULAR ) ) { if ( config_path_new && g_file_test ( config_path_new, G_FILE_TEST_IS_REGULAR ) ) {
if ( rofi_theme_parse_file ( config_path_new ) ) { if ( rofi_theme_parse_file ( config_path_new ) ) {
rofi_theme_free ( rofi_theme ); rofi_theme_free ( rofi_theme );
@ -925,8 +926,10 @@ int main ( int argc, char *argv[] )
else { else {
g_free ( config_path_new ); g_free ( config_path_new );
config_path_new = NULL; config_path_new = NULL;
config_parse_xresource_options_file ( config_path ); if ( g_file_test ( xetc, G_FILE_TEST_IS_REGULAR ) ) {
old_config_format = TRUE; config_parse_xresource_options_file ( config_path );
old_config_format = TRUE;
}
} }
} }
find_arg_str ( "-theme", &( config.theme ) ); find_arg_str ( "-theme", &( config.theme ) );