[Gemrb-commits] gemrb: branch master updated. v0.6.6-278-gb9e9e7b

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  b9e9e7b0a3b998343536030309451601869793a6 (commit)

Summary of changes:
 gemrb/GUIScripts/TextScreen.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
      from  8c4121a8980f07b6a9c9625292b270e519601739 (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=b9e9e7b0a3b998343536030309451601869793a6

commit b9e9e7b0a3b998343536030309451601869793a6
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Dec 26 19:05:09 2011 +0100

    TextScreen: make sure the label exists - it doesn't in bg2

diff --git a/gemrb/GUIScripts/TextScreen.py b/gemrb/GUIScripts/TextScreen.py
index 9d0d0ec..0a638c2 100644
--- a/gemrb/GUIScripts/TextScreen.py
+++ b/gemrb/GUIScripts/TextScreen.py
@@ -99,7 +99,7 @@ def StartTextScreen ():
 
 	Value = Table.GetValue (Row, 0)
 	#don't display the fake -1 string (No caption in toscst.2da)
-	if Value!="NONE" and Value>0:
+	if Value!="NONE" and Value>0 and TextScreen.HasControl(0x10000000):
 		Label=TextScreen.GetControl (0x10000000)
 		Label.SetText (Value)
 

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


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