Merge pull request #1684 from mfietz/issue/1683-video-npe-longpress

Video player: Do not NPE when rewind or fast-forward time is changed
This commit is contained in:
Tom Hennen 2016-02-18 17:12:43 -05:00
commit 0d03125c54
1 changed files with 6 additions and 2 deletions

View File

@ -792,7 +792,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
builder.setNegativeButton(R.string.cancel_label, null); builder.setNegativeButton(R.string.cancel_label, null);
builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> { builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> {
UserPreferences.setPrefRewindSecs(choice); UserPreferences.setPrefRewindSecs(choice);
txtvRev.setText(String.valueOf(choice)); if(txtvRev != null){
txtvRev.setText(String.valueOf(choice));
}
}); });
builder.create().show(); builder.create().show();
return true; return true;
@ -833,7 +835,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
builder.setNegativeButton(R.string.cancel_label, null); builder.setNegativeButton(R.string.cancel_label, null);
builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> { builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> {
UserPreferences.setPrefFastForwardSecs(choice); UserPreferences.setPrefFastForwardSecs(choice);
txtvFF.setText(String.valueOf(choice)); if(txtvFF != null) {
txtvFF.setText(String.valueOf(choice));
}
}); });
builder.create().show(); builder.create().show();
return true; return true;