Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dec722b authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '6824-q-gallery_crash' into 'v1-q' 

Gallery2: Check for null on menuItem update

See merge request !72
parents 8c04877f 419daaee

src/com/android/gallery3d/app/AlbumPage.java

+3 −2
Original line number Diff line number Diff line
@@ -803,8 +803,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
    }



    private void updateMenuItem() {

        if (allVideoFiles() && !mGetContent) {

            mActionMenu.findItem(R.id.action_slideshow).setVisible(false);

        MenuItem actionMenu = mActionMenu.findItem(R.id.action_slideshow);

        if (allVideoFiles() && !mGetContent && actionMenu != null) {

            actionMenu.setVisible(false);

        }

    }