mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-08 05:24:39 +01:00
need to call doResume() twice
Calling it only once on acquiring lock where before it'd been called twice meant ConnStatusHandler never got initialized. Bad.
This commit is contained in:
parent
4878afb185
commit
f072736bb8
1 changed files with 12 additions and 1 deletions
|
@ -116,6 +116,8 @@ public class BoardDelegate extends DelegateBase
|
||||||
|
|
||||||
private volatile JNIThread m_jniThread;
|
private volatile JNIThread m_jniThread;
|
||||||
private JNIThread m_jniThreadRef;
|
private JNIThread m_jniThreadRef;
|
||||||
|
private boolean m_resumeSkipped;
|
||||||
|
private boolean m_startSkipped;
|
||||||
private JNIThread.GameStateInfo m_gsi;
|
private JNIThread.GameStateInfo m_gsi;
|
||||||
|
|
||||||
private int m_nGuestDevs = -1;
|
private int m_nGuestDevs = -1;
|
||||||
|
@ -586,7 +588,12 @@ public class BoardDelegate extends DelegateBase
|
||||||
setBackgroundColor();
|
setBackgroundColor();
|
||||||
setKeepScreenOn();
|
setKeepScreenOn();
|
||||||
|
|
||||||
doResume( true );
|
if ( m_startSkipped ) {
|
||||||
|
doResume( true );
|
||||||
|
}
|
||||||
|
if ( m_resumeSkipped ) {
|
||||||
|
doResume( false );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
@ -598,6 +605,8 @@ public class BoardDelegate extends DelegateBase
|
||||||
super.onStart();
|
super.onStart();
|
||||||
if ( null != m_jniThreadRef ) {
|
if ( null != m_jniThreadRef ) {
|
||||||
doResume( true );
|
doResume( true );
|
||||||
|
} else {
|
||||||
|
m_startSkipped = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -607,6 +616,8 @@ public class BoardDelegate extends DelegateBase
|
||||||
super.onResume();
|
super.onResume();
|
||||||
if ( null != m_jniThreadRef ) {
|
if ( null != m_jniThreadRef ) {
|
||||||
doResume( false );
|
doResume( false );
|
||||||
|
} else {
|
||||||
|
m_resumeSkipped = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue