Merge ace9eb4 into f700d56

seanbudd · web-flow · commit 9395e869538c · 2023-07-12T11:40:45.000+10:00
diff --git a/source/synthDriverHandler.py b/source/synthDriverHandler.py
@@ -396,6 +396,8 @@ def _getSynthDriver(name) -> SynthDriver:
 
 
 def getSynthList():
+	from synthDrivers.silence import SynthDriver as SilenceSynthDriver
+
 	synthList = []
 	# The synth that should be placed at the end of the list.
 	lastSynth = None
@@ -409,7 +411,7 @@ def getSynthList():
 			continue
 		try:
 			if synth.check():
-				if synth.name == "silence":
+				if synth.name == SilenceSynthDriver.name:
 					lastSynth = (synth.name, synth.description)
 				else:
 					synthList.append((synth.name, synth.description))
@@ -445,6 +447,8 @@ def getSynthInstance(name, asDefault=False):
 
 
 def setSynth(name: Optional[str], isFallback: bool = False):
+	from synthDrivers.silence import SynthDriver as SilenceSynthDriver
+
 	asDefault = False
 	global _curSynth, _audioOutputDevice
 	if name is None:
@@ -475,14 +479,15 @@ def setSynth(name: Optional[str], isFallback: bool = False):
 		synthChanged.notify(synth=_curSynth, audioOutputDevice=_audioOutputDevice, isFallback=isFallback)
 		return True
 	# As there was an error loading this synth:
-	elif prevSynthName:
+	elif prevSynthName and not prevSynthName == SilenceSynthDriver.name:
+		# Don't fall back to silence if speech is expected
 		log.info(f"Falling back to previous synthDriver {prevSynthName}")
 		# There was a previous synthesizer, so switch back to that one.
 		setSynth(prevSynthName, isFallback=True)
 	else:
 		# There was no previous synth, so fallback to the next available default synthesizer
 		# that has not been tried yet.
-		log.info(f"Searching for next synthDriver")
+		log.info("Searching for next synthDriver")
 		findAndSetNextSynth(name)
 	return False
 
