From 93c483213863844702043f4bd02051c9a24b4630 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Tue, 8 May 2012 18:55:17 +0000 Subject: [PATCH] Saving as palette format no longer shows warning about lyaer/anim support. Loading a single file in command-line makes the spare use the same mode (layer/anim), so that the menus don't move when you switch git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1951 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/loadsave.c | 3 ++- src/main.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/loadsave.c b/src/loadsave.c index 7ef8bc23..5cf7051b 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -969,7 +969,8 @@ void Save_image(T_IO_Context *context) { case CONTEXT_MAIN_IMAGE: if (!File_formats[context->Format-1].Supports_layers - && Main_backups->Pages->Nb_layers > 1) + && Main_backups->Pages->Nb_layers > 1 + && !File_formats[context->Format-1].Palette_only) { if (Main_backups->Pages->Image_mode == IMAGE_MODE_ANIMATION) { diff --git a/src/main.c b/src/main.c index 3e0359ef..ac8ca984 100644 --- a/src/main.c +++ b/src/main.c @@ -868,6 +868,10 @@ int Init_program(int argc,char * argv[]) Destroy_context(&context); Redraw_layered_image(); End_of_modification(); + + // If only one image was loaded, assume the spare has same image type + if (file_in_command_line==1) + Spare_backups->Pages->Image_mode = Main_backups->Pages->Image_mode; Hide_cursor(); Compute_optimal_menu_colors(Main_palette);