From 0510444386b5465a07e2b27321586230cfeac3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Kapplm=C3=BCller?=
 <christian.kapplmueller@tonestro.com>
Date: Wed, 2 Mar 2022 16:11:22 +0100
Subject: [PATCH] made null handling graceful on view detachment

---
 .gitignore                                                      | 2 ++
 .../Xamarin.ExoPlayerSlim.UsageChecker.csproj                   | 2 +-
 Xamarin.ExoPlayerSlim/Xamarin.ExoPlayerSlim.csproj              | 2 +-
 .../main/java/com/tonestro/exoplayerslim/ExoPlayerSlimImpl.java | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 531c98d..d723b47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -449,3 +449,5 @@ FodyWeavers.xsd
 *.tlog
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudio,rider
+
+.DS_Store
diff --git a/Xamarin.ExoPlayerSlim.UsageChecker/Xamarin.ExoPlayerSlim.UsageChecker.csproj b/Xamarin.ExoPlayerSlim.UsageChecker/Xamarin.ExoPlayerSlim.UsageChecker.csproj
index 36dd668..6371f0a 100644
--- a/Xamarin.ExoPlayerSlim.UsageChecker/Xamarin.ExoPlayerSlim.UsageChecker.csproj
+++ b/Xamarin.ExoPlayerSlim.UsageChecker/Xamarin.ExoPlayerSlim.UsageChecker.csproj
@@ -112,7 +112,7 @@
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
     <PackageReference Include="Xamarin.ExoPlayerSlim">
-      <Version>2.16.1.11</Version>
+      <Version>2.16.1.12</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Xamarin.ExoPlayerSlim/Xamarin.ExoPlayerSlim.csproj b/Xamarin.ExoPlayerSlim/Xamarin.ExoPlayerSlim.csproj
index 2e60427..0bcfce9 100644
--- a/Xamarin.ExoPlayerSlim/Xamarin.ExoPlayerSlim.csproj
+++ b/Xamarin.ExoPlayerSlim/Xamarin.ExoPlayerSlim.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>Xamarin.ExoPlayerSlim</PackageId>
-    <Version>2.16.1.11</Version>
+    <Version>2.16.1.12</Version>
     <Description>Contains bindings for https://exoplayer.dev</Description>
     <Authors>Christian Kapplmüller</Authors>
     <Company>fun.music IT GmbH</Company>
diff --git a/java/ExoPlayerSlim/exoplayerslim/src/main/java/com/tonestro/exoplayerslim/ExoPlayerSlimImpl.java b/java/ExoPlayerSlim/exoplayerslim/src/main/java/com/tonestro/exoplayerslim/ExoPlayerSlimImpl.java
index ce2a1dd..3b25b11 100644
--- a/java/ExoPlayerSlim/exoplayerslim/src/main/java/com/tonestro/exoplayerslim/ExoPlayerSlimImpl.java
+++ b/java/ExoPlayerSlim/exoplayerslim/src/main/java/com/tonestro/exoplayerslim/ExoPlayerSlimImpl.java
@@ -123,7 +123,7 @@ public void attachPlayerView(View playerView, boolean useNativeControls, int asp
     @Override
     public void detachPlayerView(View playerView) {
         if (playerView == null) {
-            throw new NullPointerException("playerView must not be null");
+            return;
         }
         if (!(playerView instanceof PlayerView)) {
             throw new ClassCastException("playerView is not instance of PlayerView");