[Gemrb-commits] gemrb: branch master updated. v0.7.1-178-gf15c60f

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  f15c60f2c4cbf2248b0e3562c9af4630627789b7 (commit)
       via  d1c98d31dbb38cfc77cb6cdfa1bc7f16c5d07e74 (commit)

Summary of changes:
 gemrb/GUIScripts/GUIOPT.py |    8 ++++++--
 gemrb/core/Interface.cpp   |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)
      from  aec75fc54f2fdc6b5a05cbb43137d5408cd5dd6e (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=f15c60f2c4cbf2248b0e3562c9af4630627789b7

commit f15c60f2c4cbf2248b0e3562c9af4630627789b7
Author: Jaka Kranjc <lyn...@us...>
Date:   Wed Sep 12 17:34:27 2012 +0200

    AskAndExit: print a hint about needing to double-close to quit

diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 38efabc..73d4b2d 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -3613,6 +3613,7 @@ void Interface::AskAndExit()
 
 		LoadWindowPack("GUIOPT");
 		guiscript->RunFunction("GUIOPT", "OpenQuitMsgWindow");
+		Log(MESSAGE, "Info", "Press ctrl-c (or close the window) again to quit GemRB.\n");
 	} else {
 		ExitGemRB();
 	}

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=d1c98d31dbb38cfc77cb6cdfa1bc7f16c5d07e74

commit d1c98d31dbb38cfc77cb6cdfa1bc7f16c5d07e74
Author: Jaka Kranjc <lyn...@us...>
Date:   Wed Sep 12 17:33:19 2012 +0200

    guiopt: safer check in the exiting dialog and fix for stuck cursor

diff --git a/gemrb/GUIScripts/GUIOPT.py b/gemrb/GUIScripts/GUIOPT.py
index fa877f6..876c95a 100644
--- a/gemrb/GUIScripts/GUIOPT.py
+++ b/gemrb/GUIScripts/GUIOPT.py
@@ -769,10 +769,14 @@ def OpenQuitMsgWindow ():
 def CancelQuitMsgWindow ():
 	CloseQuitMsgWindow()
 
-	OptionsWindow.SetVisible (WINDOW_VISIBLE)
-	if not GUICommon.GameIsBG1():
+	GUICommon.GameWindow.SetVisible(WINDOW_VISIBLE)
+	if OptionsWindow:
+		OptionsWindow.SetVisible (WINDOW_VISIBLE)
+	if GameOptionsWindow:
 		GameOptionsWindow.SetVisible (WINDOW_VISIBLE)
+	if PortraitWindow:
 		PortraitWindow.SetVisible (WINDOW_VISIBLE)
+
 	return
 
 def CloseQuitMsgWindow ():

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


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