Work around wxWidgets assertion

See #12220
nvaccess · Apr 14, 2021 · a21409d · a21409d
1 parent 0efeee4
commit a21409d
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -983,9 +983,17 @@ def onPanelDeactivated(self):
 		super(SpeechSettingsPanel,self).onPanelDeactivated()
 
 	def onDiscard(self):
+		# Work around wxAssertion error #12220
+		# Manually destroying the ExpandoTextCtrl when the settings dialog is
+		# exited prevents the wxAssertion.
+		self.synthNameCtrl.Destroy()
 		self.voicePanel.onDiscard()
 
 	def onSave(self):
+		# Work around wxAssertion error #12220
+		# Manually destroying the ExpandoTextCtrl when the settings dialog is
+		# exited prevents the wxAssertion.
+		self.synthNameCtrl.Destroy()
 		self.voicePanel.onSave()
 
 class SynthesizerSelectionDialog(SettingsDialog):
@@ -3194,9 +3202,17 @@ def onPanelDeactivated(self):
 		super(BrailleSettingsPanel,self).onPanelDeactivated()
 
 	def onDiscard(self):
+		# Work around wxAssertion error #12220
+		# Manually destroying the ExpandoTextCtrl when the settings dialog is
+		# exited prevents the wxAssertion.
+		self.displayNameCtrl.Destroy()
 		self.brailleSubPanel.onDiscard()
 
 	def onSave(self):
+		# Work around wxAssertion error #12220
+		# Manually destroying the ExpandoTextCtrl when the settings dialog is
+		# exited prevents the wxAssertion.
+		self.displayNameCtrl.Destroy()
 		self.brailleSubPanel.onSave()