Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-13 08:01:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

oops. Fix assertion by not stopping dragging unless it's been

Browse source 
started.
This commit is contained in:
eehouse 2010-06-04 03:47:56 +00:00
parent 57013a9267
commit 1f246d20a3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/common/board.c
View file

@ -892,7 +892,6 @@ timerFiredForPen( BoardCtxt* board )
}
}
board->penTimerFired = XP_TRUE;
/* stop any dragging here */
}
} else if ( board->penDownObject == OBJ_SCORE ) {
LocalPlayer* lp;
@ -927,14 +926,16 @@ timerFiredForPen( BoardCtxt* board )
}
if ( !!text ) {
XP_Bool dragged;
MiniWindowStuff* stuff = &board->miniWindowStuff[MINIWINDOW_VALHINT];
makeMiniWindowForText( board, text, MINIWINDOW_VALHINT );
XP_ASSERT( stuff->text == text );
draw_drawMiniWindow(board->draw, text, &stuff->rect,
&stuff->closure);
dragDropEnd( board, board->penDownX, board->penDownY, &dragged );
XP_ASSERT( !dragged );
if ( dragDropInProgress( board ) ) {
XP_Bool dragged;
dragDropEnd( board, board->penDownX, board->penDownY, &dragged );
XP_ASSERT( !dragged );
}
}
return draw;
} /* timerFiredForPen */