[Scummvm-cvs-logs] scummvm master -> 160c5f4345d9d72faf3e42f1f82339d6ea9cc79e

[lordhoto]

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:
160c5f4345 KYRA: Fix palette glitch when quitting while viewing the family album in Kyra3.


Commit: 160c5f4345d9d72faf3e42f1f82339d6ea9cc79e
    https://github.com/scummvm/scummvm/commit/160c5f4345d9d72faf3e42f1f82339d6ea9cc79e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-08-11T19:58:27-07:00

Commit Message:
KYRA: Fix palette glitch when quitting while viewing the family album in Kyra3.

Thanks to eriktorbjorn for noticing.

Changed paths:
    engines/kyra/screen.cpp



diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 054397a..8c97e46 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -718,6 +718,13 @@ void Screen::fadePalette(const Palette &pal, int delay, const UpdateFunctor *upF
 		_vm->delay((delayAcc >> 8) * 1000 / 60);
 		delayAcc &= 0xFF;
 	}
+
+	// In case we should quit we setup the final palette here. This avoids
+	// ugly palette glitches when quitting while fading. This can for example
+	// be noticed when quitting while viewing the family album in Kyra3.
+	if (_vm->shouldQuit()) {
+		setScreenPalette(pal);
+	}
 }
 
 void Screen::getFadeParams(const Palette &pal, int delay, int &delayInc, int &diff) {