From 76f38607124892ba6d6be1a3a63fff368fc8d79e Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Tue, 23 Jan 2018 10:08:35 +0100
Subject: [PATCH] fix after rebase

---
 src/buttons.c  | 2 +-
 src/loadsave.c | 4 ++--
 src/palette.c  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/buttons.c b/src/buttons.c
index 46f5e6f9..493895e9 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -3128,7 +3128,7 @@ void Load_picture(enum CONTEXT_TYPE type)
     break;
   case CONTEXT_PALETTE:
     strcpy(filename, "");
-    strcpy(directory, Main_backups->Pages->File_directory);
+    strcpy(directory, Main.backups->Pages->File_directory);
     Init_context_layered_image(&context, filename, directory);
     context.Type = CONTEXT_PALETTE;
     context.Format = FORMAT_PAL;
diff --git a/src/loadsave.c b/src/loadsave.c
index df44159a..654fbac9 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -863,8 +863,8 @@ void Load_image(T_IO_Context *context)
       // Make a backup step
       Backup_layers(LAYER_NONE);
       // Copy the loaded palette
-      memcpy(Main_palette, context->Palette, sizeof(T_Palette));
-      memcpy(Main_backups->Pages->Palette, context->Palette, sizeof(T_Palette));
+      memcpy(Main.palette, context->Palette, sizeof(T_Palette));
+      memcpy(Main.backups->Pages->Palette, context->Palette, sizeof(T_Palette));
     }
   }
   else if (context->Type == CONTEXT_BRUSH && File_error==0)
diff --git a/src/palette.c b/src/palette.c
index 1d95abc4..2f7b5909 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -2613,13 +2613,13 @@ void Button_Palette(void)
       }
 
       case 26: // Load palette
-        memcpy(backup_palette, Main_palette, sizeof(T_Palette));
-        memcpy(Main_palette, working_palette, sizeof(T_Palette));
+        memcpy(backup_palette, Main.palette, sizeof(T_Palette));
+        memcpy(Main.palette, working_palette, sizeof(T_Palette));
         Load_picture(CONTEXT_PALETTE);
-        memcpy(working_palette, Main_palette, sizeof(T_Palette));
+        memcpy(working_palette, Main.palette, sizeof(T_Palette));
         Set_palette(working_palette);
         memcpy(temp_palette,working_palette,sizeof(T_Palette));
-        memcpy(Main_palette, backup_palette, sizeof(T_Palette));
+        memcpy(Main.palette, backup_palette, sizeof(T_Palette));
         need_to_remap=1;
         break;