Merge 87dba21 into 7736fdd

jcsteh · web-flow · commit 8a335bfc0b26 · 2025-07-11T11:02:54.000+10:00
diff --git a/nvdaHelper/local/wasapi.cpp b/nvdaHelper/local/wasapi.cpp
@@ -202,7 +202,8 @@ class WasapiPlayer {
 
 	// Reset our state due to being stopped. This runs on the feeder thread
 	// rather than on the thread which called stop() because writing to a vector
-	// isn't thread safe.
+	// isn't thread safe. We also reset the stream here because this can't be done
+	// in stop() if the feeder thread is currently writing to the buffer.
 	void completeStop();
 
 	// Convert frames into ms.
@@ -586,22 +587,21 @@ bool WasapiPlayer::didPreferredDeviceBecomeAvailable() {
 }
 
 HRESULT WasapiPlayer::stop() {
-	playState = PlayState::stopping;
 	HRESULT hr = client->Stop();
+	// It's important that we set playState *after*
+	// calling client->Stop() because otherwise, the feeder thread might see the
+	// playState change and call client->Reset() before client->Stop() runs,
+	// causing AUDCLNT_E_NOT_STOPPED.
+	playState = PlayState::stopping;
 	// If the device has been invalidated, it has already stopped. Just ignore
 	// this and behave as if we were successful to avoid a cascade of breakage.
 	// feed() will attempt to reopen the device next time it is called.
 	if (
 		hr != AUDCLNT_E_DEVICE_INVALIDATED
 		&& hr != AUDCLNT_E_NOT_INITIALIZED
+		&& FAILED(hr)
 	) {
-		if (FAILED(hr)) {
-			return hr;
-		}
-		hr = client->Reset();
-		if (FAILED(hr)) {
-			return hr;
-		}
+		return hr;
 	}
 	// If there is a feed/sync call waiting, wake it up so it can immediately
 	// return to the caller.
@@ -610,6 +610,14 @@ HRESULT WasapiPlayer::stop() {
 }
 
 void WasapiPlayer::completeStop() {
+	HRESULT hr = client->Reset();
+	if (FAILED(hr)) {
+		// We must not use LOG_ERROR here because that plays a sound and we might be
+		// in the middle of stopping our sound player.
+		LOG_DEBUGWARNING(L"Couldn't reset stream: " << hr);
+		// We deliberately continue here. If Reset failed, the stream is probably
+		// already cleared or unusable anyway. We should always reset our state.
+	}
 	nextFeedId = 0;
 	sentFrames = 0;
 	feedEnds.clear();
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -71,6 +71,7 @@ There have also been a number of other fixes and improvements, including to mous
 * It is now possible to review and spell the labels of controls in Google Chrome menus and dialogs. (#11285, @jcsteh)
 * When typing into a cell in Microsoft Excel, the braille display is now correctly updated to show the new content. (#18391)
 * Fixed bug where NLS eReader Zoomax driver did not work with all devices. (#18406, @florin-trutiu)
+* When using NVDA Remote Access, speech from User Account Control screens on the remote computer now works reliably. (#18101, @jcsteh)
 
 ### Changes for Developers
 
