[Scummvm-cvs-logs] SF.net SVN: scummvm:[47442] scummvm/trunk/engines/sci/graphics/menu.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 47442
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47442&view=rev
Author:   m_kiewitz
Date:     2010-01-22 18:20:57 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
SCI: removed error inside Menu::mouseFindMenuItemSelection, instead returning 0

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/menu.cpp

Modified: scummvm/trunk/engines/sci/graphics/menu.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/menu.cpp	2010-01-22 17:38:06 UTC (rev 47441)
+++ scummvm/trunk/engines/sci/graphics/menu.cpp	2010-01-22 18:20:57 UTC (rev 47442)
@@ -618,7 +618,7 @@
 	uint16 itemId = 0;
 
 	if (!menuId)
-		error("No menu active, but mouseFindMenuItemSelection() called");
+		return 0;
 
 	if ((mousePosition.x < _menuRect.left) || (mousePosition.x >= _menuRect.right))
 		return 0;


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