[orca] Return early when generating status bar items for itemless status bars



commit 1c4b86617cf07fd9932bfbb4cfd5674449e05c2e
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat May 9 11:09:27 2020 -0400

    Return early when generating status bar items for itemless status bars
    
    The status bar in Gedit, and now Pluma, are inaccessible -- exposing no
    children. Thus when we get the on-screen items, all we wind up with is
    the status bar. Calling generate for it leads to infinite recursion.

 src/orca/braille_generator.py | 2 +-
 src/orca/speech_generator.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/braille_generator.py b/src/orca/braille_generator.py
index 131311a00..1a3e92e26 100644
--- a/src/orca/braille_generator.py
+++ b/src/orca/braille_generator.py
@@ -351,7 +351,7 @@ class BrailleGenerator(generator.Generator):
             return []
 
         items = self._script.utilities.statusBarItems(obj)
-        if not items:
+        if not items or items == [statusBar]:
             return []
 
         result = []
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 65978b43d..9b52d8a71 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -2324,7 +2324,7 @@ class SpeechGenerator(generator.Generator):
             return []
 
         items = self._script.utilities.statusBarItems(statusBar)
-        if not items:
+        if not items or items == [statusBar]:
             return []
 
         result = []


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