diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java index e28627de4..ad462331b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/MediaViewerActivity.java @@ -586,8 +586,9 @@ public final class MediaViewerActivity extends BaseActivity implements IExtended @Override public void setUserVisibleHint(boolean isVisibleToUser) { super.setUserVisibleHint(isVisibleToUser); - if (isVisibleToUser) { - getActivity().supportInvalidateOptionsMenu(); + final FragmentActivity activity = getActivity(); + if (isVisibleToUser && activity != null) { + activity.supportInvalidateOptionsMenu(); } } @@ -1027,7 +1028,10 @@ public final class MediaViewerActivity extends BaseActivity implements IExtended public void setUserVisibleHint(boolean isVisibleToUser) { super.setUserVisibleHint(isVisibleToUser); if (isVisibleToUser) { - getActivity().supportInvalidateOptionsMenu(); + final FragmentActivity activity = getActivity(); + if (activity != null) { + activity.supportInvalidateOptionsMenu(); + } } else if (mVideoView != null && mVideoView.isPlaying()) { mVideoView.pause(); updatePlayerState(); @@ -1281,7 +1285,10 @@ public final class MediaViewerActivity extends BaseActivity implements IExtended public void setUserVisibleHint(boolean isVisibleToUser) { super.setUserVisibleHint(isVisibleToUser); if (isVisibleToUser) { - getActivity().supportInvalidateOptionsMenu(); + final FragmentActivity activity = getActivity(); + if (activity != null) { + activity.supportInvalidateOptionsMenu(); + } } } }