Merge pull request #9521 from pratyaksh1610/branch-9518

Fixes #9518: Crash fix when click "Add to playlist" while the current list is still loading
TeamNewPipe · Dec 31, 2022 · 6af2242 · 6af2242
2 parents 27f6c3b + d21fac6
commit 6af2242
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -230,24 +230,24 @@ public boolean onOptionsItemSelected(final MenuItem item) {
  ShareUtils.openUrlInBrowser(requireContext(), url);
  break;
  case R.id.menu_item_share:
- if (currentInfo != null) {
- ShareUtils.shareText(requireContext(), name, url,
- currentInfo.getThumbnailUrl());
- }
+ ShareUtils.shareText(requireContext(), name, url,
+ currentInfo == null ? null : currentInfo.getThumbnailUrl());
  break;
  case R.id.menu_item_bookmark:
  onBookmarkClicked();
  break;
  case R.id.menu_item_append_playlist:
- disposables.add(PlaylistDialog.createCorrespondingDialog(
- getContext(),
- getPlayQueue()
- .getStreams()
- .stream()
- .map(StreamEntity::new)
- .collect(Collectors.toList()),
- dialog -> dialog.show(getFM(), TAG)
- ));
+ if (currentInfo != null) {
+ disposables.add(PlaylistDialog.createCorrespondingDialog(
+ getContext(),
+ getPlayQueue()
+ .getStreams()
+ .stream()
+ .map(StreamEntity::new)
+ .collect(Collectors.toList()),
+ dialog -> dialog.show(getFM(), TAG)
+ ));
+ }
  break;
  default:
  return super.onOptionsItemSelected(item);