[orca: 1/2] braille: do not shutdown Braille unless the user really asked for it



commit 4e907e2c8439048677d9792b603bfe6f66230aeb
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Wed May 27 18:05:15 2020 +0200

    braille: do not shutdown Braille unless the user really asked for it
    
    392380251f88 ('braille: hand off Braille output on NoFocus') makes Orca
    shutdown Braille on no-focus when running with brlapi 0.7. This is however
    relatively heavy, and lets brltty's "screen not in text mode" default output
    show up briefly if the window manager uses a transient non-accessible
    window. It's better to just let Orca keep its Braille output in that
    case, and only leave the Braille output with brlapi 0.8's priority
    support.
    
    This also fixes another issue: some people run both Orca and brltty at the
    same time, starting brltty *after* Orca to make sure that it's only when
    brltty wakes up when focus goes to a terminal, that Orca's output gets
    hidden behind brltty's output. Making Orca shutdown Braille unexpectedly
    will break that assumption. We should thus only shutdown Braille only if
    it's the profile that does say so. Again, this is also fixed with brlapi
    0.8's priority support.

 src/orca/braille.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/braille.py b/src/orca/braille.py
index bb46d2471..d57161dea 100644
--- a/src/orca/braille.py
+++ b/src/orca/braille.py
@@ -1133,8 +1133,9 @@ def disableBraille():
     global idle
 
     if _brlAPIRunning and not idle:
-        if not _idleBraille():
-            # BrlAPI before 0.8
+        if not _idleBraille() and \
+            not _settingsManager.getSetting('enableBraille'):
+            # BrlAPI before 0.8 and we really want to shut down
             msg = "BRAILLE: could not go idle, completely shut down"
             debug.println(debug.LEVEL_INFO, msg, True)
             shutdown()


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