[Scummvm-cvs-logs] SF.net SVN: scummvm:[45334] scummvm/trunk/engines/sci/engine

[thebluegr at users.sourceforge.net]

Revision: 45334
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45334&view=rev
Author:   thebluegr
Date:     2009-10-22 09:36:46 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Fixed a crash when selecting menu items

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/kmenu.cpp

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-10-22 09:13:45 UTC (rev 45333)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-10-22 09:36:46 UTC (rev 45334)
@@ -33,7 +33,6 @@
 #include "sci/engine/kernel_types.h"
 #include "sci/gui/gui.h"
 #include "sci/engine/message.h"
-#include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxPort, GfxVisual
 #include "sci/gfx/menubar.h"
 

Modified: scummvm/trunk/engines/sci/engine/kmenu.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-10-22 09:13:45 UTC (rev 45333)
+++ scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-10-22 09:36:46 UTC (rev 45334)
@@ -181,7 +181,7 @@
 	if (menu_mode) {
 		int old_item;
 		int old_menu;
-		GfxPort *port = NULL;
+		GfxPort *port = sciw_new_menu(s, s->titlebar_port, s->_menubar, 0);
 
 		item_nr = -1;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.