From c7b64c973dadcfb9f499fc739343c8ba99921914 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Mon, 24 Apr 2023 12:57:31 +0200
Subject: [PATCH] Fix player overlay opacity

---
 Model/Player/PlayerQueue.swift               | 2 +-
 Shared/Modifiers/PlayerOverlayModifier.swift | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Model/Player/PlayerQueue.swift b/Model/Player/PlayerQueue.swift
index ef910ce5..462032e5 100644
--- a/Model/Player/PlayerQueue.swift
+++ b/Model/Player/PlayerQueue.swift
@@ -10,7 +10,7 @@ extension PlayerModel {
     }
 
     var videoForDisplay: Video? {
-        videoBeingOpened ?? (closing ? nil : currentVideo)
+        videoBeingOpened ?? currentVideo
     }
 
     func play(_ videos: [Video], shuffling: Bool = false) {
diff --git a/Shared/Modifiers/PlayerOverlayModifier.swift b/Shared/Modifiers/PlayerOverlayModifier.swift
index 5bfd794f..a64f0e4e 100644
--- a/Shared/Modifiers/PlayerOverlayModifier.swift
+++ b/Shared/Modifiers/PlayerOverlayModifier.swift
@@ -30,10 +30,16 @@ struct PlayerOverlayModifier: ViewModifier {
                     }
                 }
                 .animation(.easeIn, value: player.videoForDisplay)
-                .opacity(player.videoForDisplay == nil ? 0 : 1)
+                .opacity(opacity)
         }
     }
 
+    var opacity: Double {
+        guard !player.closing else { return 0 }
+
+        return player.videoForDisplay == nil ? 0 : 1
+    }
+
     var maxWidth: Double {
         playerBarMaxWidth == "0" ? .infinity : (Double(playerBarMaxWidth) ?? 600)
     }