[Scummvm-cvs-logs] scummvm master -> 46b80d3e7474a57959758e6681fd65fbe0216f34

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
46b80d3e74 SHERLOCK: RT: Fix redrawing journal when page is changed


Commit: 46b80d3e7474a57959758e6681fd65fbe0216f34
    https://github.com/scummvm/scummvm/commit/46b80d3e7474a57959758e6681fd65fbe0216f34
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-29T22:02:54-04:00

Commit Message:
SHERLOCK: RT: Fix redrawing journal when page is changed

Changed paths:
    engines/sherlock/tattoo/tattoo_journal.cpp



diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp
index cd8a94a..737593f 100644
--- a/engines/sherlock/tattoo/tattoo_journal.cpp
+++ b/engines/sherlock/tattoo/tattoo_journal.cpp
@@ -99,6 +99,7 @@ void TattooJournal::show() {
 
 	// Free the images
 	delete _journalImages;
+	_journalImages = nullptr;
 
 	// Reset back to whatever scroll was active for the screen
 	screen._currentScroll = oldScroll;
@@ -155,7 +156,7 @@ void TattooJournal::handleKeyboardEvents() {
 				// Scroll Up 1 page
 				drawJournal(1, LINES_PER_PAGE);
 				drawScrollBar();
-				show();
+				drawJournal(0, 0);
 				screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 				_wait = false;
 			}
@@ -179,7 +180,7 @@ void TattooJournal::handleKeyboardEvents() {
 				// Scroll down 1 page
 				drawJournal(2, LINES_PER_PAGE);
 				drawScrollBar();
-				show();
+				drawJournal(0, 0);
 				screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 
 				_wait = false;
@@ -273,7 +274,7 @@ void TattooJournal::handleButtons() {
 					else
 						drawJournal(1, 10 * LINES_PER_PAGE);
 					drawScrollBar();
-					show();
+					drawJournal(0, 0);
 					screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 					_wait = false;
 				}