When timer fires for pen held on board, don't do anything if we're in

trade mode.
This commit is contained in:
Eric House 2013-11-10 07:08:49 -08:00
parent 7457ce9b80
commit c9ba7b2fe1

View file

@ -1116,7 +1116,10 @@ timerFiredForPen( BoardCtxt* board )
#endif
if ( board->penDownObject == OBJ_BOARD ) {
if ( !dragDropInProgress( board ) || !dragDropHasMoved( board ) ) {
if ( board_inTrade( board, NULL ) ) {
/* do nothing */
} else if ( !dragDropInProgress( board )
|| !dragDropHasMoved( board ) ) {
XP_U16 col, row;
coordToCell( board, board->penDownX, board->penDownY, &col, &row );