Fix parsing old themes from rofi-themes repo.

This commit is contained in:
Dave Davenport 2017-06-07 20:41:43 +02:00
parent 9fe67c1822
commit 47c7518656
2 changed files with 3 additions and 5 deletions

View file

@ -448,7 +448,7 @@ if ( queue == NULL ){
yylval->colorval.blue = rofi_theme_parse_convert_hex(yytext[3],yytext[3]);
return T_COLOR;
}
<PROPERTIES>argb:{HEX}{8} {
<PROPERTIES>argb:{HEX}{7,8} {
yylval->colorval.alpha = rofi_theme_parse_convert_hex(yytext[5],yytext[6]);
yylval->colorval.red = rofi_theme_parse_convert_hex(yytext[7],yytext[8]);
yylval->colorval.green = rofi_theme_parse_convert_hex(yytext[9],yytext[10]);

View file

@ -838,10 +838,6 @@ int main ( int argc, char *argv[] )
TICK_N ( "Setup Modi" );
}
if ( rofi_theme_is_empty ( ) ) {
rofi_theme_convert_old ();
}
if ( rofi_theme_is_empty ( ) ) {
if ( rofi_theme_parse_string ( default_theme ) ) {
g_warning ( "Failed to parse default theme. Giving up.." );
@ -856,7 +852,9 @@ int main ( int argc, char *argv[] )
cleanup ();
return EXIT_FAILURE;
}
rofi_theme_convert_old ();
}
/**
* Make small commandline changes to the current theme.
*/