Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't stop comms before every save, but only when stopping

Browse source
This commit is contained in:
Eric House 2013-07-16 08:06:23 -07:00
parent 5571816339
commit 3d9539b42b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
View file

@ -175,7 +175,7 @@ public class JNIThread extends Thread {
join(); join();
// Assert.assertFalse( isAlive() ); // Assert.assertFalse( isAlive() );
} catch ( java.lang.InterruptedException ie ) { } catch ( java.lang.InterruptedException ie ) {
DbgUtils.logf( "JNIThread.waitToStop() got %s", ie.toString() ); DbgUtils.loge( ie );
} }
} }
@ -287,7 +287,7 @@ public class JNIThread extends Thread {
XwJNI.server_do( m_jniGamePtr ); XwJNI.server_do( m_jniGamePtr );
// And let it tell the relay (if any) it's leaving // And let it tell the relay (if any) it's leaving
XwJNI.comms_stop( m_jniGamePtr ); // XwJNI.comms_stop( m_jniGamePtr );
XwJNI.game_getGi( m_jniGamePtr, m_gi ); XwJNI.game_getGi( m_jniGamePtr, m_gi );
if ( null != m_newDict ) { if ( null != m_newDict ) {
@ -334,6 +334,11 @@ public class JNIThread extends Thread {
continue; continue;
} }
save_jni(); save_jni();
// This is gross: we take the relay connection down
// then bring it right back up again each time there's
// a message received (to save any state changes it
// brought). There must be a better way.
// XwJNI.comms_start( m_jniGamePtr );
break; break;
case CMD_DRAW: case CMD_DRAW:
@ -619,6 +624,7 @@ public class JNIThread extends Thread {
} // for } // for
if ( m_saveOnStop ) { if ( m_saveOnStop ) {
XwJNI.comms_stop( m_jniGamePtr );
save_jni(); save_jni();
} }
} // run } // run