Fix a case where the image could be in layer mode while the anim toolbar is visible. Note that from now on, if main and spare are single-image, changing the type of one will not change the type of the other.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1934 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2012-03-15 19:51:19 +00:00
parent 55f4884e34
commit 99ce514ce8

View File

@ -3659,8 +3659,7 @@ void Set_bar_visibility(word bar, int visible, int with_redraw)
/// Display_menu() and Display_all_screen() /// Display_menu() and Display_all_screen()
int Check_menu_mode(void) int Check_menu_mode(void)
{ {
if (Main_backups->Pages->Image_mode == IMAGE_MODE_ANIMATION if (Main_backups->Pages->Image_mode == IMAGE_MODE_ANIMATION)
&& Main_backups->Pages->Nb_layers>1 )
{ {
if (Menu_bars[MENUBAR_LAYERS].Visible) if (Menu_bars[MENUBAR_LAYERS].Visible)
{ {
@ -3669,8 +3668,7 @@ int Check_menu_mode(void)
return 1; return 1;
} }
} }
else if (Main_backups->Pages->Image_mode != IMAGE_MODE_ANIMATION else
&& Main_backups->Pages->Nb_layers>1 )
{ {
if (Menu_bars[MENUBAR_ANIMATION].Visible) if (Menu_bars[MENUBAR_ANIMATION].Visible)
{ {