[Scummvm-cvs-logs] scummvm master -> 80271c24b122f737aca6a617b7096260315e110d

[fuzzie]

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:
80271c24b1 MOHAWK: Try LB subpage 0 if loading subpage 1 fails.


Commit: 80271c24b122f737aca6a617b7096260315e110d
    https://github.com/scummvm/scummvm/commit/80271c24b122f737aca6a617b7096260315e110d
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2013-04-19T06:05:53-07:00

Commit Message:
MOHAWK: Try LB subpage 0 if loading subpage 1 fails.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 43e21cf..a8b8c6a 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -1358,8 +1358,9 @@ void MohawkEngine_LivingBooks::handleNotify(NotifyEvent &event) {
 			if (!loadPage((LBMode)event.newMode, event.newPage, event.newSubpage)) {
 				if (event.newPage != 0 || !loadPage((LBMode)event.newMode, _curPage, event.newSubpage))
 					if (event.newSubpage != 0 || !loadPage((LBMode)event.newMode, event.newPage, 1))
-						error("kLBNotifyChangeMode failed to move to mode %d, page %d.%d",
-							event.newMode, event.newPage, event.newSubpage);
+						if (event.newSubpage != 1 || !loadPage((LBMode)event.newMode, event.newPage, 0))
+							error("kLBNotifyChangeMode failed to move to mode %d, page %d.%d",
+								event.newMode, event.newPage, event.newSubpage);
 			}
 			break;
 		case 3: