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

Address reports of crashes tapping wordlist button when device is

Browse source 
having trouble making initial relay connection for a game (which I
can't reproduce) by disabling that button when there isn't a current
player.
This commit is contained in:
Eric House 2012-01-17 18:58:45 -08:00
parent 00575c6d4e
commit 8a66cd4c1f
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -1580,6 +1580,8 @@ public class BoardActivity extends XWActivity
m_toolbar.update( Toolbar.BUTTON_HINT_PREV, m_gsi.canHint );
m_toolbar.update( Toolbar.BUTTON_HINT_NEXT, m_gsi.canHint );
m_toolbar.update( Toolbar.BUTTON_CHAT, m_gsi.gameIsConnected );
m_toolbar.update( Toolbar.BUTTON_BROWSE_DICT,
null != m_gi.dictName( m_view.getCurPlayer() ) );
}
private void adjustTradeVisibility()

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
View file

@ -71,7 +71,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
private int m_layoutWidth;
private int m_layoutHeight;
private Canvas m_canvas; // owns the bitmap
private int m_trayOwner;
private int m_trayOwner = -1;
private Rect m_valRect;
private Rect m_letterRect;
private Drawable m_rightArrow;

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
View file

@ -305,8 +305,11 @@ public class CurGameInfo {
public String dictName( int indx )
{
LocalPlayer lp = players[indx];
return dictName( lp );
String dname = null;
if ( 0 <= indx && indx < nPlayers ) {
dname = dictName( players[indx] );
}
return dname;
}
public boolean addPlayer()