orca r4567 - trunk/src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Mon Feb 16 22:13:55 2009
New Revision: 4567
URL: http://svn.gnome.org/viewvc/orca?rev=4567&view=rev

Log:
Handle missing speech parameters better.


Modified:
   trunk/src/orca/gnomespeechfactory.py

Modified: trunk/src/orca/gnomespeechfactory.py
==============================================================================
--- trunk/src/orca/gnomespeechfactory.py	(original)
+++ trunk/src/orca/gnomespeechfactory.py	Mon Feb 16 22:13:55 2009
@@ -532,9 +532,21 @@
         saveParameters = True
         for existingSpeaker in self.__speakers.values():
             if existingSpeaker.voiceInfo == speaker.voiceInfo:
-                self.__rateInfo[speaker] = self.__rateInfo[existingSpeaker]
-                self.__pitchInfo[speaker] = self.__pitchInfo[existingSpeaker]
-                self.__volumeInfo[speaker] = self.__volumeInfo[existingSpeaker]
+                try:
+                    self.__rateInfo[speaker] = \
+                        self.__rateInfo[existingSpeaker]
+                except:
+                    pass
+                try:
+                    self.__pitchInfo[speaker] = \
+                        self.__pitchInfo[existingSpeaker]
+                except:
+                    pass
+                try:
+                    self.__volumeInfo[speaker] = \
+                        self.__volumeInfo[existingSpeaker]
+                except:
+                    pass
                 saveParameters = False
                 break