From c2723096ab88eae17c773b6e8f94161cc5fd03a3 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 28 Jan 2026 02:39:56 +0100
Subject: [PATCH] Avoid rebuilding BackgroundPlayerUi if already in place

---
 app/src/main/java/org/schabi/newpipe/player/Player.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index b70441d51..e18ead899 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -576,6 +576,7 @@ public final class Player implements PlaybackListener, Listener {
 
     private void initUIsForCurrentPlayerType() {
         if ((UIs.get(MainPlayerUi.class).isPresent() && playerType == PlayerType.MAIN)
+                || (UIs.get(BackgroundPlayerUi.class).isPresent() && playerType == PlayerType.AUDIO)
                 || (UIs.get(PopupPlayerUi.class).isPresent() && playerType == PlayerType.POPUP)) {
             // correct UI already in place
             return;
@@ -603,7 +604,7 @@ public final class Player implements PlaybackListener, Listener {
                 UIs.addAndPrepare(new PopupPlayerUi(this, binding));
                 break;
             case AUDIO:
-                UIs.destroyAll(VideoPlayerUi.class);
+                UIs.destroyAll(VideoPlayerUi.class); // destroys both MainPlayerUi and PopupPlayerUi
                 UIs.addAndPrepare(new BackgroundPlayerUi(this));
                 break;
         }