[Scummvm-cvs-logs] scummvm master -> 84edf0c6a776caf1d783e8a2ef6ed5a2225e29cf

[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:
84edf0c6a7 SHERLOCK: RT: Keep journal buttons disabled when searching


Commit: 84edf0c6a776caf1d783e8a2ef6ed5a2225e29cf
    https://github.com/scummvm/scummvm/commit/84edf0c6a776caf1d783e8a2ef6ed5a2225e29cf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-03T21:08:31-04:00

Commit Message:
SHERLOCK: RT: Keep journal buttons disabled when searching

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 41de828..57d3d24 100644
--- a/engines/sherlock/tattoo/tattoo_journal.cpp
+++ b/engines/sherlock/tattoo/tattoo_journal.cpp
@@ -764,6 +764,7 @@ int TattooJournal::getFindName(bool printError) {
 	cursorY = r.top + screen.fontHeight() + 12;
 
 	drawControls(1);
+	disableControls();
 	
 	// Backup the area under the text entry
 	Surface bgSurface(r.width() - 6, screen.fontHeight());
@@ -771,7 +772,7 @@ int TattooJournal::getFindName(bool printError) {
 		r.right - 3, cursorY + screen.fontHeight()));
 
 	if (printError) {
-		screen.gPrint(Common::Point(r.left + (r.width() - screen.stringWidth(FIXED(TextNotFound))) / 2, cursorY),
+		screen.gPrint(Common::Point(r.left + (r.width() - screen.stringWidth(FIXED(TextNotFound))) / 2, cursorY), 
 			INFO_TOP, "%s", FIXED(TextNotFound));
 	} else {
 		// If there was a name already entered, copy it to name and display it