[orca] Fix for bug #643306 - Orca is not correctly failing back on the default script for unknown toolkit



commit 0c016e6e54aff1b65ce4f1623a971b29212b5b6e
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Feb 25 11:47:52 2011 -0500

    Fix for bug #643306 - Orca is not correctly failing back on the default script for unknown toolkit

 src/orca/script_manager.py |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/script_manager.py b/src/orca/script_manager.py
index 49fa97e..933a865 100644
--- a/src/orca/script_manager.py
+++ b/src/orca/script_manager.py
@@ -170,16 +170,22 @@ class ScriptManager:
 
         if not script:
             script = self.getDefaultScript(app)
+            debug.println(debug.LEVEL_FINE, "Default script created")
 
         return script
 
     def getDefaultScript(self, app=None):
-        if not self._defaultScript:
-            import scripts.default as default
-            self._defaultScript = default.Script(app)
-            _eventManager.registerListeners(self._defaultScript)
+        if not app and self._defaultScript:
+            return self._defaultScript
 
-        return self._defaultScript
+        import scripts.default as default
+        script = default.Script(app)
+        _eventManager.registerListeners(script)
+
+        if not app:
+            self._defaultScript = script
+
+        return script
 
     def getScript(self, app, obj=None):
         """Get a script for an app (and make it if necessary).  This is used



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]