From a6736dd0f41cec63c8562ff643ade838b00fdcb4 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 4 Jun 2024 22:32:10 +0200 Subject: [PATCH] Fix earlyinit with no Qt available We need to wait with init_qtlog until after we know we have Qt available. Closes #8220 (cherry picked from commit 1e1af23d34371dabbe224b0c9649981a1e412377) --- doc/changelog.asciidoc | 10 ++++++++++ qutebrowser/misc/earlyinit.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 5a797fdc5..c63a655c4 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,6 +15,16 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. +[[v3.2.1]] +v3.2.1 (unreleased) +------------------- + +Fixed +~~~~~ + +- When the selected Qt wrapper is unavailable, qutebrowser now again shows a + GUI error message instead of only an exception in the terminal. + [[v3.2.0]] v3.2.0 (2024-06-03) ------------------- diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index a7bdb8252..c008286e6 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -337,11 +337,11 @@ def early_init(args): init_faulthandler() # Then we configure the selected Qt wrapper info = machinery.init(args) - # Init Qt logging after machinery is initialized - init_qtlog(args) # Here we check if QtCore is available, and if not, print a message to the # console or via Tk. check_qt_available(info) + # Init Qt logging after machinery is initialized + init_qtlog(args) # Now we can be sure QtCore is available, so we can print dialogs on # errors, so people only using the GUI notice them as well. check_libraries()