From 17fb59cdeb504a41dba8a8fe9f74388dd90e1f20 Mon Sep 17 00:00:00 2001 From: Michael Gregorius Date: Thu, 7 Dec 2017 18:55:40 +0100 Subject: [PATCH] Fix a crash that occurs when library "KF5WidgetsAddons" cannot be loaded Add a check to see if the library "KF5WidgetsAddons" could be loaded and return if that's not the case. Also move a using declaration near the place where it is used first. --- src/gui/MainWindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 32d16546b..d8ea33f33 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -69,8 +69,13 @@ //Work around an issue on KDE5 as per https://bugs.kde.org/show_bug.cgi?id=337491#c21 void disableAutoKeyAccelerators(QWidget* mainWindow) { - using DisablerFunc = void(*)(QWidget*); QLibrary kf5WidgetsAddon("KF5WidgetsAddons", 5); + if (!kf5WidgetsAddon.isLoaded()) + { + return; + } + + using DisablerFunc = void(*)(QWidget*); DisablerFunc setNoAccelerators = reinterpret_cast(kf5WidgetsAddon.resolve("_ZN19KAcceleratorManager10setNoAccelEP7QWidget")); if(setNoAccelerators)