From f0e772ca977b148a8a695ffc79ad0e5a3c6b4aac Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Fri, 22 Dec 2017 21:58:31 +0200
Subject: [PATCH] Fixed: Loading states in DMG mode results in a black screen

---
 Core/display.c    | 2 +-
 Core/save_state.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Core/display.c b/Core/display.c
index 4466e34..f9533ba 100755
--- a/Core/display.c
+++ b/Core/display.c
@@ -279,7 +279,7 @@ uint32_t GB_convert_rgb15(GB_gameboy_t *gb, uint16_t color)
 
 void GB_palette_changed(GB_gameboy_t *gb, bool background_palette, uint8_t index)
 {
-    if (!gb->rgb_encode_callback) return;
+    if (!gb->rgb_encode_callback || !gb->is_cgb) return;
     uint8_t *palette_data = background_palette? gb->background_palettes_data : gb->sprite_palettes_data;
     uint16_t color = palette_data[index & ~1] | (palette_data[index | 1] << 8);
 
diff --git a/Core/save_state.c b/Core/save_state.c
index 24604c1..933b417 100644
--- a/Core/save_state.c
+++ b/Core/save_state.c
@@ -303,6 +303,11 @@ int GB_load_state_from_buffer(GB_gameboy_t *gb, const uint8_t *buffer, size_t le
         gb->rumble_callback(gb, gb->rumble_state);
     }
     
+    for (unsigned i = 0; i < 32; i++) {
+        GB_palette_changed(gb, false, i * 2);
+        GB_palette_changed(gb, true, i * 2);
+    }
+    
     return 0;
 }