m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Remove the spaces I just added when looking for the fonts,

Browse Source 
-No need to check if a pointer is NULL before freeing it, free() takes care of that,
-Removed useless variables after Yves cleanup


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@889 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2009-06-28 19:36:06 +00:00
parent cc64de7e1f
commit 48c98b2234
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
buttons.c
View File

@ -1018,13 +1018,7 @@ void Button_Skins(void)
{ {
short clicked_button; short clicked_button;
short temp; short temp;
char quicksearch_filename[MAX_PATH_CHARACTERS]="";
char * most_matching_filename;
char skinsdir[MAX_PATH_CHARACTERS]; char skinsdir[MAX_PATH_CHARACTERS];
DIR* current_directory; //Répertoire courant
struct dirent* entry; // Structure de lecture des éléments
struct stat Infos_enreg;
char * current_path;
static int selector_position=0; static int selector_position=0;
T_Config Config_choisie = Config; T_Config Config_choisie = Config;
T_Dropdown_button * font_dropdown; T_Dropdown_button * font_dropdown;
@ -1248,6 +1242,8 @@ void Button_Skins(void)
if(clicked_button == 1) if(clicked_button == 1)
{ {
char* tmp_font;
char* tmp_ptr;
T_Gui_skin * gfx; T_Gui_skin * gfx;
strcpy(skinsdir,"skins/"); strcpy(skinsdir,"skins/");
strcat( strcat(
@ -1265,16 +1261,18 @@ void Button_Skins(void)
free(Gfx); free(Gfx);
Gfx = gfx; Gfx = gfx;
// Font selection // Font selection
new_font = Load_font(fonts[selected_font]); tmp_font = strdup(fonts[selected_font]);
tmp_ptr=tmp_font;
while(*tmp_ptr!=' ' && *tmp_ptr!='\0')
tmp_ptr++;
*tmp_ptr='\0';
new_font = Load_font(tmp_font);
free(tmp_font);
if (new_font) if (new_font)
{ {
free(Menu_font); free(Menu_font);
Menu_font = new_font; Menu_font = new_font;
if (Config_choisie.Font_name) free (Config_choisie.Font_name);
{
free (Config_choisie.Font_name);
Config_choisie.Font_name = NULL;
}
Config_choisie.Font_name = (char *)malloc(strlen(fonts[selected_font])+1); Config_choisie.Font_name = (char *)malloc(strlen(fonts[selected_font])+1);
if (Config_choisie.Font_name) if (Config_choisie.Font_name)
{ {