[Scummvm-cvs-logs] SF.net SVN: scummvm: [30219] scummvm/branches/branch-0-11-0/backends/ platform/wince/CEgui/ToolbarHandler.cpp

[knakos at users.sourceforge.net]

Revision: 30219
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30219&view=rev
Author:   knakos
Date:     2008-01-04 08:09:14 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
fix a race - bug #1863961 (#1769503) (sync commit)

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/backends/platform/wince/CEgui/ToolbarHandler.cpp

Modified: scummvm/branches/branch-0-11-0/backends/platform/wince/CEgui/ToolbarHandler.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/wince/CEgui/ToolbarHandler.cpp	2008-01-04 16:08:49 UTC (rev 30218)
+++ scummvm/branches/branch-0-11-0/backends/platform/wince/CEgui/ToolbarHandler.cpp	2008-01-04 16:09:14 UTC (rev 30219)
@@ -52,6 +52,7 @@
 			return false;
 		if (_current == name)
 			return true;
+		_active->action(0, 0, false);	// make sure any items are unpushed when changing toolbars (e.g. forced VK->main panel)
 		_current = name;
 		_active = _toolbarMap[name];
 		_active->forceRedraw();


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