mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-15 15:41:24 +01:00
When timer fires for pen held on board, don't do anything if we're in
trade mode.
This commit is contained in:
parent
7457ce9b80
commit
c9ba7b2fe1
1 changed files with 4 additions and 1 deletions
|
@ -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 );
|
||||
|
||||
|
|
Loading…
Reference in a new issue