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

don't pass empty stream to comms_send: this fixes a problem where

Browse source 
client code calls server_initClientConnection when the game's already
been started and empty messages get queued up.  Ideally the call
wouldn't happen but I'm not sure how to test if a game's begun.
server's doing the right thing not putting anything in the message.
This commit is contained in:
eehouse 2010-03-21 03:10:56 +00:00
parent 5806aa0aca
commit a5c3fa5f59
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/android/XWords4/jni/xwjni.c
View file

@ -240,12 +240,10 @@ JNIEXPORT jboolean JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_dict_1tilesAreSame
( JNIEnv* env, jclass C, jint dictPtr1, jint dictPtr2 )
{
LOG_FUNC();
jboolean result;
const DictionaryCtxt* dict1 = (DictionaryCtxt*)dictPtr1;
const DictionaryCtxt* dict2 = (DictionaryCtxt*)dictPtr2;
result = dict_tilesAreSame( dict1, dict2 );
LOG_RETURNF( "%d", result );
return result;
}
@ -253,11 +251,9 @@ JNIEXPORT jobjectArray JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_dict_1getChars
( JNIEnv* env, jclass C, jint dictPtr )
{
LOG_FUNC();
jobject result = NULL;
result = and_dictionary_getChars( env, (DictionaryCtxt*)dictPtr );
(*env)->DeleteLocalRef( env, result );
LOG_RETURNF( "%p", result );
return result;
}
@ -359,7 +355,6 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeNewGame
JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_game_1dispose
( JNIEnv * env, jclass claz, jint gamePtr )
{
LOG_FUNC();
JNIState* state = (JNIState*)gamePtr;
#ifdef MEM_DEBUG
MemPoolCtx* mpool = state->mpool;
@ -381,7 +376,6 @@ JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_game_1dispose
state->env = oldEnv;
XP_FREE( mpool, state );
mpool_destroy( mpool );
LOG_RETURN_VOID();
} /* game_dispose */
JNIEXPORT jboolean JNICALL
@ -826,7 +820,9 @@ and_send_on_close( XWStreamCtxt* stream, void* closure )
JNIState* state = (JNIState*)globals->state;
XP_ASSERT( !!state->game.comms );
comms_send( state->game.comms, stream );
if ( stream_getSize( stream ) > 0 ) {
comms_send( state->game.comms, stream );
}
}
JNIEXPORT void JNICALL