[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[9219] VASSAL-src/trunk/src/VASSAL/counters/ BasicPiece.java

[<uck...@us...>]

Revision: 9219
          http://sourceforge.net/p/vassalengine/svn/9219
Author:   uckelman
Date:     2016-04-07 18:40:04 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Fixed Bug 12526: Switching desktop on Mac OS X 10.11.3 sometimes clones
the currently selected unit

Applied patch from Alex Carmel.

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/counters/BasicPiece.java

Modified: VASSAL-src/trunk/src/VASSAL/counters/BasicPiece.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/counters/BasicPiece.java	2016-04-07 18:40:01 UTC (rev 9218)
+++ VASSAL-src/trunk/src/VASSAL/counters/BasicPiece.java	2016-04-07 18:40:04 UTC (rev 9219)
@@ -438,7 +438,7 @@
     }
     Command comm = null;
     final GamePiece outer = Decorator.getOutermost(this);
-    if (KeyStroke.getKeyStroke(cloneKey, InputEvent.CTRL_MASK).equals(stroke)) {
+    if (cloneKey != 0 && KeyStroke.getKeyStroke(cloneKey, InputEvent.CTRL_MASK).equals(stroke)) {
       final GamePiece newPiece = ((AddPiece) GameModule.getGameModule().decode(GameModule.getGameModule().encode(new AddPiece(outer)))).getTarget();
       newPiece.setId(null);
       GameModule.getGameModule().getGameState().addPiece(newPiece);
@@ -463,7 +463,7 @@
         }
       }
     }
-    else if (KeyStroke.getKeyStroke(deleteKey, InputEvent.CTRL_MASK).equals(stroke)) {
+    else if (deleteKey != 0 && KeyStroke.getKeyStroke(deleteKey, InputEvent.CTRL_MASK).equals(stroke)) {
       comm = new RemovePiece(outer);
       if (getMap() != null && GlobalOptions.getInstance().autoReportEnabled() && !Boolean.TRUE.equals(outer.getProperty(Properties.INVISIBLE_TO_OTHERS))) {
         String s = "* " + outer.getLocalizedName();

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


------------------------------------------------------------------------------
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn