[Gemrb-commits] gemrb: branch master updated. v0.6.2-837-g888589a

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  888589a15877cb8efe3d7266776563fdb639e15f (commit)

Summary of changes:
 gemrb/core/GUI/GameControl.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
      from  d0c098fc92aae7fb6316d9a972b27708b1a3ed43 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=888589a15877cb8efe3d7266776563fdb639e15f

commit 888589a15877cb8efe3d7266776563fdb639e15f
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Mar 1 20:18:36 2011 +0100

    GameControl::ChangeMap: fixed new crash

diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp
index b68b12b..ef09e46 100644
--- a/gemrb/core/GUI/GameControl.cpp
+++ b/gemrb/core/GUI/GameControl.cpp
@@ -2625,7 +2625,7 @@ void GameControl::ChangeMap(Actor *pc, bool forced)
 {
 	//swap in the area of the actor
 	Game* game = core->GetGame();
-	if (forced || (stricmp( pc->Area, game->CurrentArea) != 0) ) {
+	if (forced || (pc && stricmp( pc->Area, game->CurrentArea) != 0) ) {
 		dialoghandler->EndDialog();
 		overInfoPoint = NULL;
 		overContainer = NULL;

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator