Merge branch 'android_branch' into relay_noconn

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Eric House 2015-08-17 06:41:58 -07:00
commit f5e645f62a

View file

@ -523,11 +523,13 @@ public class JNIThread extends Thread {
break;
case CMD_RESEND:
boolean force = ((Boolean)args[0]).booleanValue();
int nSent =
XwJNI.comms_resendAll( m_jniGamePtr,
((Boolean)args[0]).booleanValue(),
XwJNI.comms_resendAll( m_jniGamePtr, force,
((Boolean)args[1]).booleanValue() );
if ( force ) {
Message.obtain(m_handler, MSGS_SENT, nSent).sendToTarget();
}
break;
// case CMD_ACKANY:
// XwJNI.comms_ackAny( m_jniGamePtr );