From 3c0fd6449f02cd0338720697b100c7506f40b046 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 27 Aug 2021 17:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=A1=8C=E9=9D=A2=E6=AD=8C=E8=AF=8D=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4APP=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/main/java/com/lxmusicmobile/lyric/Lyric.java | 2 +-
 .../src/main/java/com/lxmusicmobile/lyric/LyricView.java | 9 +++++++--
 publish/changeLog.md                                     | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/com/lxmusicmobile/lyric/Lyric.java b/android/app/src/main/java/com/lxmusicmobile/lyric/Lyric.java
index b0a10c3..0325d81 100644
--- a/android/app/src/main/java/com/lxmusicmobile/lyric/Lyric.java
+++ b/android/app/src/main/java/com/lxmusicmobile/lyric/Lyric.java
@@ -68,7 +68,7 @@ public class Lyric extends LyricPlayer {
       lyricView.runOnUiThread(new Runnable() {
         @Override
         public void run() {
-          lyricView.destroy();
+          lyricView.destroyView();
         }
       });
     }
diff --git a/android/app/src/main/java/com/lxmusicmobile/lyric/LyricView.java b/android/app/src/main/java/com/lxmusicmobile/lyric/LyricView.java
index d50133a..71429e3 100644
--- a/android/app/src/main/java/com/lxmusicmobile/lyric/LyricView.java
+++ b/android/app/src/main/java/com/lxmusicmobile/lyric/LyricView.java
@@ -348,10 +348,15 @@ public class LyricView extends Activity implements View.OnTouchListener {
     windowManager.updateViewLayout(textView, layoutParams);
   }
 
-  public void destroy() {
+  public void destroyView() {
+    if (textView == null) return;
     windowManager.removeView(textView);
-    windowManager = null;
     textView = null;
+  }
+
+  public void destroy() {
+    destroyView();
+    windowManager = null;
     layoutParams = null;
   }
 }
diff --git a/publish/changeLog.md b/publish/changeLog.md
index b8d2dfc..c265099 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,3 +1,7 @@
+### 修复
+
+- 修复某些情况下桌面歌词会导致APP崩溃的问题
+
 ### 其他
 
 - 升级React native到v0.65.1