mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-14 08:01:38 +01:00
Merge remote branch 'origin/android_branch' into android_branch
Conflicts: xwords4/common/dictnry.c xwords4/common/dictnry.h xwords4/linux/linuxmain.c
This commit is contained in:
commit
f6ff3e85c6
1 changed files with 2 additions and 1 deletions
|
@ -783,7 +783,8 @@ prevWord( const DictionaryCtxt* dict, EdgeArray* edges )
|
|||
while ( 0 < edges->nEdges && ! success ) {
|
||||
if ( isFirstEdge( dict, edges->edges[edges->nEdges-1] ) ) {
|
||||
--edges->nEdges;
|
||||
success = 0 < edges->nEdges && ISACCEPTING( dict, edges->edges[edges->nEdges-1] );
|
||||
success = 0 < edges->nEdges
|
||||
&& ISACCEPTING( dict, edges->edges[edges->nEdges-1] );
|
||||
continue;
|
||||
}
|
||||
edges->edges[edges->nEdges-1] -= dict->nodeSize;
|
||||
|
|
Loading…
Reference in a new issue