From 8fa5522819229628f9f43e542a90245380f5edf5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 21 Mar 2016 20:19:55 -0400
Subject: SHERLOCK: Fix crashes due to back buffer refactoring

---
 engines/sherlock/scalpel/scalpel_screen.cpp | 1 +
 engines/sherlock/tattoo/tattoo_map.cpp      | 2 ++
 engines/sherlock/tattoo/tattoo_screen.cpp   | 1 +
 3 files changed, 4 insertions(+)

(limited to 'engines')

diff --git a/engines/sherlock/scalpel/scalpel_screen.cpp b/engines/sherlock/scalpel/scalpel_screen.cpp
index ba78f487b6..15e8436be6 100644
--- a/engines/sherlock/scalpel/scalpel_screen.cpp
+++ b/engines/sherlock/scalpel/scalpel_screen.cpp
@@ -30,6 +30,7 @@ namespace Scalpel {
 ScalpelScreen::ScalpelScreen(SherlockEngine *vm) : Screen(vm) {
 	_backBuffer1.create(320, 200);
 	_backBuffer2.create(320, 200);
+	activateBackBuffer1();
 }
 
 void ScalpelScreen::makeButton(const Common::Rect &bounds, int textX,
diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp
index 0839e46260..23e8bd9739 100644
--- a/engines/sherlock/tattoo/tattoo_map.cpp
+++ b/engines/sherlock/tattoo/tattoo_map.cpp
@@ -106,6 +106,7 @@ int TattooMap::show() {
 	ImageFile *map = new ImageFile("map.vgs");
 	screen._backBuffer1.create(SHERLOCK_SCREEN_WIDTH * 2, SHERLOCK_SCREEN_HEIGHT * 2);
 	screen._backBuffer1.SHblitFrom((*map)[0], Common::Point(0, 0));
+	screen.activateBackBuffer1();
 	delete map;
 
 	screen.clear();
@@ -224,6 +225,7 @@ int TattooMap::show() {
 	// Reset the back buffers back to standard size
 	screen._backBuffer1.create(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	screen._backBuffer2.create(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	screen.activateBackBuffer1();
 
 	return result;
 }
diff --git a/engines/sherlock/tattoo/tattoo_screen.cpp b/engines/sherlock/tattoo/tattoo_screen.cpp
index c98ae2679d..159060b19e 100644
--- a/engines/sherlock/tattoo/tattoo_screen.cpp
+++ b/engines/sherlock/tattoo/tattoo_screen.cpp
@@ -30,6 +30,7 @@ namespace Tattoo {
 TattooScreen::TattooScreen(SherlockEngine *vm) : Screen(vm) {
 	_backBuffer1.create(640, 480);
 	_backBuffer2.create(640, 480);
+	activateBackBuffer1();
 }
 
 } // End of namespace Tattoo
-- 
cgit v1.2.3