Prevent IllegalArgumentException when closing popup

app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt

@@ -46,6 +46,6 @@ data class PickerSubscriptionItem(
     fun updateSelected(containerView: View, isSelected: Boolean) {
         this.isSelected = isSelected
         PickerSubscriptionItemBinding.bind(containerView).selectedHighlight
-                .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
+            .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
     }
 }

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -1349,13 +1349,23 @@ public final class Player implements
 
     public void removePopupFromView() {
         if (windowManager != null) {
-            final boolean isCloseOverlayHasParent = closeOverlayBinding != null
+            // wrap in try-catch since it could sometimes generate errors randomly
-                    && closeOverlayBinding.closeButton.getParent() != null;
+            try {
-            if (popupHasParent()) {
+                if (popupHasParent()) {
-                windowManager.removeView(binding.getRoot());
+                    windowManager.removeView(binding.getRoot());
+                }
+            } catch (final IllegalArgumentException e) {
+                Log.w(TAG, "Failed to remove popup from window manager", e);
             }
-            if (isCloseOverlayHasParent) {
+
-                windowManager.removeView(closeOverlayBinding.getRoot());
+            try {
+                final boolean closeOverlayHasParent = closeOverlayBinding != null
+                        && closeOverlayBinding.getRoot().getParent() != null;
+                if (closeOverlayHasParent) {
+                    windowManager.removeView(closeOverlayBinding.getRoot());
+                }
+            } catch (final IllegalArgumentException e) {
+                Log.w(TAG, "Failed to remove popup overlay from window manager", e);
             }
         }
     }