[Scummvm-cvs-logs] SF.net SVN: scummvm: [23833] scummvm/trunk/engines/agi/agi.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 23833
          http://svn.sourceforge.net/scummvm/?rev=23833&view=rev
Author:   eriktorbjorn
Date:     2006-09-07 09:13:41 -0700 (Thu, 07 Sep 2006)

Log Message:
-----------
Don't create a second Menu object unless the first one has been deleted. This
seems to fix bug #1553513 ("AGI: Crash after restart").

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2006-09-07 12:47:42 UTC (rev 23832)
+++ scummvm/trunk/engines/agi/agi.cpp	2006-09-07 16:13:41 UTC (rev 23833)
@@ -311,7 +311,9 @@
 
 	init_words();
 
-	menu = new Menu();
+	if (!menu)
+		menu = new Menu();
+
 	init_pri_table();
 
 	/* clear string buffer */
@@ -522,6 +524,7 @@
 	game.sbuf = (uint8 *) calloc(_WIDTH, _HEIGHT);
 	game.hires = (uint8 *) calloc(_WIDTH * 2, _HEIGHT);
 
+	menu = 0;
 	_sprites = new SpritesMan;
 	_text = new TextMan;
 	init_video();


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