daniel/deepdrft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Merge branch 'stream-now-loading-fix' into dev

Browse Source
This commit is contained in:
daniel-c-harvey
2026-06-08 07:11:13 -04:00
parent b7b539743b c57e61f7f9
commit 317e9f84b8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DeepDrftPublic.Client/Layout/DeepDrftMenu.razor
+11 -2
View File
@@ -21,7 +21,7 @@
disabled="@_streamLoading" disabled="@_streamLoading"
aria-busy="@_streamLoading.ToString().ToLowerInvariant()" aria-busy="@_streamLoading.ToString().ToLowerInvariant()"
@onclick="StreamNow"> @onclick="StreamNow">
@if (_streamLoading) @if (_findingTrack)
{ {
<span>Finding a track&#8230;</span> <span>Finding a track&#8230;</span>
} }
@@ -83,7 +83,7 @@
disabled="@_streamLoading" disabled="@_streamLoading"
aria-busy="@_streamLoading.ToString().ToLowerInvariant()" aria-busy="@_streamLoading.ToString().ToLowerInvariant()"
@onclick="StreamNowMobile"> @onclick="StreamNowMobile">
@if (_streamLoading) @if (_findingTrack)
{ {
<span>Finding a track&#8230;</span> <span>Finding a track&#8230;</span>
} }
@@ -118,6 +118,7 @@
private bool _mobileMenuOpen; private bool _mobileMenuOpen;
private bool _streamLoading; private bool _streamLoading;
private bool _findingTrack;
private string? _streamMessage; private string? _streamMessage;
private CancellationTokenSource? _messageCts; private CancellationTokenSource? _messageCts;
@@ -135,6 +136,7 @@
if (_streamLoading) return; if (_streamLoading) return;
_streamLoading = true; _streamLoading = true;
_findingTrack = true;
_streamMessage = null; _streamMessage = null;
// Warm the AudioContext FIRST, inside the gesture's call stack and before the network // Warm the AudioContext FIRST, inside the gesture's call stack and before the network
@@ -164,6 +166,12 @@
if (closeMobileMenu) if (closeMobileMenu)
_mobileMenuOpen = false; _mobileMenuOpen = false;
// Track is found — flip only the label flag so the button reverts to
// "Stream Now ▶" before the stream begins, while _streamLoading stays true
// to keep the button disabled and the re-entrancy guard intact.
_findingTrack = false;
StateHasChanged();
if (PlayerService is not null) if (PlayerService is not null)
await PlayerService.SelectTrackStreaming(track); await PlayerService.SelectTrackStreaming(track);
} }
@@ -174,6 +182,7 @@
finally finally
{ {
_streamLoading = false; _streamLoading = false;
_findingTrack = false;
} }
} }