mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-30 08:34:16 +01:00
when blocking dialogs want to stack, rather than assert, just drop the
second one. I'm not sure this is the right thing to do, but it won't matter except when the assert was firing.
This commit is contained in:
parent
1686f3d9a8
commit
ea205ebf97
1 changed files with 23 additions and 18 deletions
|
@ -1232,7 +1232,10 @@ public class BoardActivity extends XWActivity
|
||||||
|
|
||||||
private int waitBlockingDialog( final int dlgID, int cancelResult )
|
private int waitBlockingDialog( final int dlgID, int cancelResult )
|
||||||
{
|
{
|
||||||
Assert.assertFalse( m_blockingDlgPosted );
|
int result = cancelResult;
|
||||||
|
if ( m_blockingDlgPosted ) { // this has been true; dunno why
|
||||||
|
Utils.logf( "waitBlockingDialog: dropping dlgID %d", dlgID );
|
||||||
|
} else {
|
||||||
setBlockingThread();
|
setBlockingThread();
|
||||||
|
|
||||||
m_handler.post( new Runnable() {
|
m_handler.post( new Runnable() {
|
||||||
|
@ -1254,7 +1257,9 @@ public class BoardActivity extends XWActivity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
clearBlockingThread();
|
clearBlockingThread();
|
||||||
return m_resultCode;
|
result = m_resultCode;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void nonBlockingDialog( final int dlgID, String txt )
|
private void nonBlockingDialog( final int dlgID, String txt )
|
||||||
|
|
Loading…
Add table
Reference in a new issue