Merge 9b13992 into 73038eb

michaelDCurran · web-flow · commit 59b99d26e616 · 2020-03-10T15:05:35.000+10:00
diff --git a/source/synthDrivers/_espeak.py b/source/synthDrivers/_espeak.py
@@ -83,6 +83,9 @@
 #EE_BUFFER_FULL=1
 #EE_NOT_FOUND=2
 
+#eSpeak initialization flags
+espeakINITIALIZE_DONT_EXIT = 0x8000
+
 class espeak_EVENT_id(Union):
 	_fields_=[
 		('number',c_int),
@@ -329,9 +332,13 @@ def initialize(indexCallback=None):
 	espeakDLL.espeak_GetCurrentVoice.restype=POINTER(espeak_VOICE)
 	espeakDLL.espeak_SetVoiceByName.argtypes=(c_char_p,)
 	eSpeakPath=os.path.abspath("synthDrivers")
-	sampleRate=espeakDLL.espeak_Initialize(AUDIO_OUTPUT_SYNCHRONOUS,300,
-		os.fsencode(eSpeakPath),0)
-	if sampleRate<0:
+	sampleRate=espeakDLL.espeak_Initialize(
+		AUDIO_OUTPUT_SYNCHRONOUS,300,
+		os.fsencode(eSpeakPath),
+		# #10607: ensure espeak does not exit NVDA's process on errors such as the espeak path being invalid.
+		espeakINITIALIZE_DONT_EXIT
+	)
+	if sampleRate <= 0:
 		raise OSError("espeak_Initialize %d"%sampleRate)
 	player = nvwave.WavePlayer(channels=1, samplesPerSec=sampleRate, bitsPerSample=16,
 		outputDevice=config.conf["speech"]["outputDevice"],
