[Freeorion-programmers] SF.net SVN: freeorion:[3368] trunk/FreeOrion/UI/CombatSetupWnd.cpp

[<tz...@us...>]

Revision: 3368
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3368&view=rev
Author:   tzlaine
Date:     2010-03-06 16:31:15 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
Restored left-click object selection functionality to CombatWnd when a
CombatSetupWnd is active, but no placeable ship is currently active.
Previously, CombatSetupWnd was filtering out CombatWnd's LClick events even
when the user was not placing a ship.

Modified Paths:
--------------
    trunk/FreeOrion/UI/CombatSetupWnd.cpp

Modified: trunk/FreeOrion/UI/CombatSetupWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/CombatSetupWnd.cpp	2010-03-06 16:08:50 UTC (rev 3367)
+++ trunk/FreeOrion/UI/CombatSetupWnd.cpp	2010-03-06 16:31:15 UTC (rev 3368)
@@ -316,8 +316,8 @@
             ShipPlaced(combat_ship);
 #endif
             EndCurrentShipPlacement();
+            retval = true;
         }
-        retval = true;
     } else if (event.Type() == GG::WndEvent::RClick) {
         EndCurrentShipPlacement();
         retval = true;