From 99ce514ce8c25dafd255f100f6476ab3ad35ee25 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Thu, 15 Mar 2012 19:51:19 +0000 Subject: [PATCH] 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 --- src/engine.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/engine.c b/src/engine.c index e3501e07..bf70f83d 100644 --- a/src/engine.c +++ b/src/engine.c @@ -3659,8 +3659,7 @@ void Set_bar_visibility(word bar, int visible, int with_redraw) /// Display_menu() and Display_all_screen() int Check_menu_mode(void) { - if (Main_backups->Pages->Image_mode == IMAGE_MODE_ANIMATION - && Main_backups->Pages->Nb_layers>1 ) + if (Main_backups->Pages->Image_mode == IMAGE_MODE_ANIMATION) { if (Menu_bars[MENUBAR_LAYERS].Visible) { @@ -3669,8 +3668,7 @@ int Check_menu_mode(void) return 1; } } - else if (Main_backups->Pages->Image_mode != IMAGE_MODE_ANIMATION - && Main_backups->Pages->Nb_layers>1 ) + else { if (Menu_bars[MENUBAR_ANIMATION].Visible) {