2.8.6 fix dialog pop

arianneorpilla · Jul 2, 2023 · cbf7ceb · cbf7ceb
1 parent ecb34fe
commit cbf7ceb
Showing 1 changed file with 30 additions and 6 deletions.
diff --git a/yuuna/lib/src/pages/implementations/player_source_page.dart b/yuuna/lib/src/pages/implementations/player_source_page.dart
@@ -304,9 +304,21 @@ class _PlayerSourcePageState extends BaseSourcePageState<PlayerSourcePage>
                 ),
                 actions: [
                   TextButton(
-                    onPressed: () {
-                      Navigator.pop(context);
-                      Navigator.pop(context);
+                    onPressed: () async {
+                      if (mounted) {
+                        Navigator.pop(context);
+                      }
+
+                      await onSourcePagePop();
+
+                      if (mounted) {
+                        Navigator.pop(context, true);
+                      }
+                      await appModel.closeMedia(
+                        ref: ref,
+                        mediaSource: appModel.currentMediaSource!,
+                        item: widget.item,
+                      );
                     },
                     child: Text(t.dialog_close),
                   ),
@@ -342,9 +354,21 @@ class _PlayerSourcePageState extends BaseSourcePageState<PlayerSourcePage>
                 ),
                 actions: [
                   TextButton(
-                    onPressed: () {
-                      Navigator.pop(context);
-                      Navigator.pop(context);
+                    onPressed: () async {
+                      if (mounted) {
+                        Navigator.pop(context);
+                      }
+
+                      await onSourcePagePop();
+
+                      if (mounted) {
+                        Navigator.pop(context, true);
+                      }
+                      await appModel.closeMedia(
+                        ref: ref,
+                        mediaSource: appModel.currentMediaSource!,
+                        item: widget.item,
+                      );
                     },
                     child: Text(t.dialog_close),
                   ),