Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug introduced with dictionary lookup of words played that meant

Browse source 
trades didn't get reported as remote moves -- it just became your turn
without notice.
This commit is contained in:
Eric House 2012-05-09 18:22:05 -07:00
parent 2996af17ce
commit 013d9c689b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/jni/utilwrapper.c
View file

@ -249,15 +249,15 @@ and_util_turnChanged(XW_UtilCtxt* uc)
static void static void
and_util_informMove( XW_UtilCtxt* uc, XWStreamCtxt* expl, XWStreamCtxt* words ) and_util_informMove( XW_UtilCtxt* uc, XWStreamCtxt* expl, XWStreamCtxt* words )
{ {
if ( !!words ) {
UTIL_CBK_HEADER( "informMove", "(Ljava/lang/String;Ljava/lang/String;)V" ); UTIL_CBK_HEADER( "informMove", "(Ljava/lang/String;Ljava/lang/String;)V" );
jstring jexpl = streamToJString( env, expl ); jstring jexpl = streamToJString( env, expl );
jstring jwords = streamToJString( env, words ); jstring jwords = !!words ? streamToJString( env, words ) : NULL;
(*env)->CallVoidMethod( env, util->jutil, mid, jexpl, jwords ); (*env)->CallVoidMethod( env, util->jutil, mid, jexpl, jwords );
(*env)->DeleteLocalRef( env, jexpl ); (*env)->DeleteLocalRef( env, jexpl );
if ( !!jwords ) {
(*env)->DeleteLocalRef( env, jwords ); (*env)->DeleteLocalRef( env, jwords );
UTIL_CBK_TAIL();
} }
UTIL_CBK_TAIL();
} }
static void static void

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -1396,7 +1396,7 @@ public class BoardActivity extends XWActivity
{ {
m_dlgBytes = expl; m_dlgBytes = expl;
m_dlgTitle = R.string.info_title; m_dlgTitle = R.string.info_title;
m_words = wordsToArray( words ); m_words = null == words? null : wordsToArray( words );
waitBlockingDialog( DLG_SCORES_BLK, 0 ); waitBlockingDialog( DLG_SCORES_BLK, 0 );
} }