From c3cde5ab2f36c751d08b4a780bd8443c8f9efb02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Haris=20Gu=C5=A1i=C4=87?= <harisgusic.dev@gmail.com>
Date: Sun, 31 Oct 2021 10:32:55 +0100
Subject: [PATCH] Fix segfault in ConfigHandler (#2029)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
---
 src/utils/confighandler.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
index 49bac2a4..b848c077 100644
--- a/src/utils/confighandler.cpp
+++ b/src/utils/confighandler.cpp
@@ -466,9 +466,8 @@ QSet<QString>& ConfigHandler::recognizedGeneralOptions()
 {
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    static QSet<QString> options =
-      QSet<QString>(::recognizedGeneralOptions.keys().begin(),
-                    ::recognizedGeneralOptions.keys().end());
+    auto keys = ::recognizedGeneralOptions.keys();
+    static QSet<QString> options = QSet<QString>(keys.begin(), keys.end());
 #else
     static QSet<QString> options =
       QSet<QString>::fromList(::recognizedGeneralOptions.keys());
@@ -479,8 +478,8 @@ QSet<QString>& ConfigHandler::recognizedGeneralOptions()
 QSet<QString>& ConfigHandler::recognizedShortcutNames()
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    static QSet<QString> names = QSet<QString>(
-      recognizedShortcuts.keys().begin(), recognizedShortcuts.keys().end());
+    auto keys = recognizedShortcuts.keys();
+    static QSet<QString> names = QSet<QString>(keys.begin(), keys.end());
 #else
     static QSet<QString> names =
       QSet<QString>::fromList(recognizedShortcuts.keys());