Revision e9f567ac
Added by Leszek Koltunski over 3 years ago
src/main/java/org/distorted/screens/RubikScreenBase.java | ||
---|---|---|
183 | 183 |
@Override |
184 | 184 |
public void run() |
185 | 185 |
{ |
186 |
mLockButton.setImageResource(getLockIcon(act)); |
|
186 |
if( mLockButton!=null ) |
|
187 |
mLockButton.setImageResource(getLockIcon(act)); |
|
187 | 188 |
} |
188 | 189 |
}); |
189 | 190 |
} |
src/main/java/org/distorted/screens/RubikScreenPlay.java | ||
---|---|---|
464 | 464 |
{ |
465 | 465 |
mObject= preferences.getInt("statePlay_object", DEF_OBJECT); |
466 | 466 |
mSize = preferences.getInt("statePlay_size" , DEF_SIZE ); |
467 |
|
|
468 |
int sizeIndex = ObjectList.getSizeIndex(mObject,mSize); |
|
469 |
int maxLevel = ObjectList.getMaxLevel(mObject, sizeIndex); |
|
470 |
|
|
471 |
// This means the app has been upgraded to a new version which swapped the |
|
472 |
// Object for a new one with larger sizeIndex and now getMaxLevel() returns |
|
473 |
// 0. Reset the object to default, otherwise we'll get a crash later on. |
|
474 |
|
|
475 |
if( maxLevel==0 ) |
|
476 |
{ |
|
477 |
mObject = DEF_OBJECT; |
|
478 |
mSize = DEF_SIZE; |
|
479 |
} |
|
467 | 480 |
} |
468 | 481 |
|
469 | 482 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Bugfixes for two issues with 1.8.0 seen in the field.