benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix segfault in ConfigHandler (#2029)

Browse Source 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-10-31 10:32:55 +01:00
committed by GitHub
parent 731b82a96d
commit c3cde5ab2f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/utils/confighandler.cpp
View File

@@ -466,9 +466,8 @@ QSet<QString>& ConfigHandler::recognizedGeneralOptions()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
static QSet<QString> options = auto keys = ::recognizedGeneralOptions.keys();
QSet<QString>(::recognizedGeneralOptions.keys().begin(), static QSet<QString> options = QSet<QString>(keys.begin(), keys.end());
::recognizedGeneralOptions.keys().end());
#else #else
static QSet<QString> options = static QSet<QString> options =
QSet<QString>::fromList(::recognizedGeneralOptions.keys()); QSet<QString>::fromList(::recognizedGeneralOptions.keys());
@@ -479,8 +478,8 @@ QSet<QString>& ConfigHandler::recognizedGeneralOptions()
QSet<QString>& ConfigHandler::recognizedShortcutNames() QSet<QString>& ConfigHandler::recognizedShortcutNames()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
static QSet<QString> names = QSet<QString>( auto keys = recognizedShortcuts.keys();
recognizedShortcuts.keys().begin(), recognizedShortcuts.keys().end()); static QSet<QString> names = QSet<QString>(keys.begin(), keys.end());
#else #else
static QSet<QString> names = static QSet<QString> names =
QSet<QString>::fromList(recognizedShortcuts.keys()); QSet<QString>::fromList(recognizedShortcuts.keys());