Fix wrong menu colors when recovering a backup.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1269 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2010-01-17 19:54:02 +00:00
parent 027db7736a
commit 28b2122997
2 changed files with 6 additions and 2 deletions

View File

@ -1292,7 +1292,7 @@ int Check_recovery(void)
Display_all_screen(); Display_all_screen();
return 1; return 1;
}*/ }*/
return 0; return restored_main || restored_spare;
} }
const int Rotation_safety_backup = 8; const int Rotation_safety_backup = 8;

6
main.c
View File

@ -664,7 +664,7 @@ int Init_program(int argc,char * argv[])
// Gfx->Default_palette[MC_Dark] =Fav_menu_colors[1]=Config.Fav_menu_colors[1]; // Gfx->Default_palette[MC_Dark] =Fav_menu_colors[1]=Config.Fav_menu_colors[1];
// Gfx->Default_palette[MC_Light]=Fav_menu_colors[2]=Config.Fav_menu_colors[2]; // Gfx->Default_palette[MC_Light]=Fav_menu_colors[2]=Config.Fav_menu_colors[2];
// Gfx->Default_palette[MC_White]=Fav_menu_colors[3]=Config.Fav_menu_colors[3]; // Gfx->Default_palette[MC_White]=Fav_menu_colors[3]=Config.Fav_menu_colors[3];
Compute_optimal_menu_colors(Gfx->Default_palette); // Compute_optimal_menu_colors(Gfx->Default_palette);
// Infos sur les trames (Sieve) // Infos sur les trames (Sieve)
Sieve_mode=0; Sieve_mode=0;
@ -761,6 +761,10 @@ int Init_program(int argc,char * argv[])
{ {
// Some files were loaded from last crash-exit. // Some files were loaded from last crash-exit.
// Do not load files from command-line, nor show splash screen. // Do not load files from command-line, nor show splash screen.
Compute_optimal_menu_colors(Main_palette);
Display_all_screen();
Display_menu();
Display_cursor();
} }
else else
{ {