Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

use game dict if no player dict (to avoid NPE)

Browse source
This commit is contained in:
Andy2 2011-04-25 21:01:15 -07:00
parent ecc5357ef8
commit 7a5920e9f2
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -676,7 +676,8 @@ public class GameConfig extends XWActivity
ArrayAdapter<String> adapter =
DictLangCache.getDictsAdapter( this, m_gi.dictLang );
configSpinnerWDownload( dictsSpinner, adapter, onSel, lp.dictName );
configSpinnerWDownload( dictsSpinner, adapter, onSel,
m_gi.dictName(lp) );
}
private void configLangSpinner()

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

@ -279,6 +279,15 @@ public class CurGameInfo {
return DictLangCache.getLangName( m_context, dictLang );
}
public String dictName( final LocalPlayer lp )
{
String dname = lp.dictName;
if ( null == dname ) {
dname = dictName;
}
return dname;
}
public boolean addPlayer()
{
boolean added = nPlayers < MAX_NUM_PLAYERS;