[orca] Handle hyperlink interface results causing us to cycle in SayAll



commit 844cb7ee776ad388f81e0ada18dae3fda0e907fc
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Jul 15 18:49:43 2019 -0400

    Handle hyperlink interface results causing us to cycle in SayAll

 src/orca/scripts/web/script.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/src/orca/scripts/web/script.py b/src/orca/scripts/web/script.py
index 3f10dbfe1..7112dd62e 100644
--- a/src/orca/scripts/web/script.py
+++ b/src/orca/scripts/web/script.py
@@ -619,8 +619,13 @@ class Script(default.Script):
 
             lastObj, lastOffset = contents[-1][0], contents[-1][2]
             obj, characterOffset = self.utilities.findNextCaretInOrder(lastObj, lastOffset - 1)
-            if (obj, characterOffset) == (lastObj, lastOffset):
+            if obj == lastObj and characterOffset <= lastOffset:
                 obj, characterOffset = self.utilities.findNextCaretInOrder(lastObj, lastOffset)
+            if obj == lastObj and characterOffset <= lastOffset:
+                msg = "WEB: Cycle within object detected in textLines. Last: %s, %i Next: %s, %i" \
+                    % (lastObj, lastOffset, obj, characterOffset)
+                debug.println(debug.LEVEL_INFO, msg, True)
+                break
 
             done = obj is None
 


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