Merge pull request #538 from FineFindus/fix/hashtag-timeline-open-crash

fix(Timeline/Hashtag): check if hashtag is null
LucasGGamerM · Sep 9, 2024 · d81eb6a · d81eb6a
2 parents f30e12f + 08542cd
commit d81eb6a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
@@ -295,7 +295,7 @@ private void createOptionsMenu(){
 		followMenuItem=optionsMenu.findItem(R.id.follow_hashtag);
 		pinMenuItem=optionsMenu.findItem(R.id.pin);
 		followMenuItem.setVisible(toolbarContentVisible);
-		updateFollowState(hashtag.following);
+		updateFollowState(hashtag!=null && hashtag.following);
 //		pinMenuItem.setShowAsAction(toolbarContentVisible ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_ALWAYS);
 		super.updatePinButton(pinMenuItem);