gwh/x50ng
1
0
Fork 0
forked from Miroirs/x49gp
Code Pull requests Activity

(hopefully) fix segfault on x49gpng --print-config >> ~/.config/x49gpng/config.lua

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-11-10 18:33:46 +01:00
parent 6089396a7a
commit 62458e2b11
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/x49gpng/options.c
View file

@ -282,27 +282,7 @@ void config_init( char* progname, int argc, char* argv[] )
opt.model = MODEL_49GP; opt.model = MODEL_49GP;
if ( strcmp( svalue_model, "49gp-newrpl" ) == 0 ) if ( strcmp( svalue_model, "49gp-newrpl" ) == 0 )
opt.model = MODEL_49GP_NEWRPL; opt.model = MODEL_49GP_NEWRPL;
}
lua_getglobal( config_lua_values, "name" );
opt.name = strdup( luaL_optstring( config_lua_values, -1, NULL ) );
lua_getglobal( config_lua_values, "font" );
opt.font = strdup( luaL_optstring( config_lua_values, -1, NULL ) );
lua_getglobal( config_lua_values, "text_scale" );
opt.text_scale = luaL_optinteger( config_lua_values, -1, 1.0 );
lua_getglobal( config_lua_values, "display_scale" );
opt.display_scale = luaL_optinteger( config_lua_values, -1, 1.0 );
}
/****************************************************/
/* 2. treat command-line params which have priority */
/****************************************************/
if ( clopt_name != NULL )
opt.name = strdup( clopt_name );
else
switch ( opt.model ) { switch ( opt.model ) {
case MODEL_50G_NEWRPL: case MODEL_50G_NEWRPL:
opt.name = "HP 50g / newRPL"; opt.name = "HP 50g / newRPL";
@ -318,6 +298,26 @@ void config_init( char* progname, int argc, char* argv[] )
opt.name = "HP 50g"; opt.name = "HP 50g";
break; break;
} }
}
lua_getglobal( config_lua_values, "name" );
opt.name = strdup( luaL_optstring( config_lua_values, -1, opt.name ) );
lua_getglobal( config_lua_values, "font" );
opt.font = strdup( luaL_optstring( config_lua_values, -1, opt.font ) );
lua_getglobal( config_lua_values, "text_scale" );
opt.text_scale = luaL_optinteger( config_lua_values, -1, 1 );
lua_getglobal( config_lua_values, "display_scale" );
opt.display_scale = luaL_optinteger( config_lua_values, -1, 2 );
}
/****************************************************/
/* 2. treat command-line params which have priority */
/****************************************************/
if ( clopt_name != NULL )
opt.name = strdup( clopt_name );
if ( clopt_font != NULL ) if ( clopt_font != NULL )
opt.font = strdup( clopt_font ); opt.font = strdup( clopt_font );
if ( clopt_model != -1 ) if ( clopt_model != -1 )