am f5864fbb: am a5bfac5b: Merge "Fix NPE"
* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12': Fix NPEmain
commit
86b2c57c47
|
@ -894,7 +894,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
|||
// Check that expected word matches.
|
||||
if (oldLogUnit != null) {
|
||||
final String oldLogUnitWord = oldLogUnit.getWord();
|
||||
if (!oldLogUnitWord.equals(expectedWord)) {
|
||||
if (oldLogUnitWord != null && !oldLogUnitWord.equals(expectedWord)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue