From 03cb9d8a03f21600eb7b3f9313c51dbfd71320dd Mon Sep 17 00:00:00 2001 From: Taha Date: Fri, 8 Jan 2016 21:02:48 -0500 Subject: [PATCH] qTox uses default smiley pack if there's an invalid one in the qtox.ini file (fixes #2757) --- src/persistence/settings.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index 88c390d79..95b2b0136 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -192,7 +192,12 @@ void Settings::loadGlobal() s.endGroup(); s.beginGroup("GUI"); - smileyPack = s.value("smileyPack", ":/smileys/Universe/emoticons.xml").toString(); + static const QString DEFAULT_SMILEYS = ":/smileys/Universe/emoticons.xml"; + smileyPack = s.value("smileyPack", DEFAULT_SMILEYS).toString(); + if (!SmileyPack::isValid(smileyPack)) + { + smileyPack = DEFAULT_SMILEYS; + } emojiFontPointSize = s.value("emojiFontPointSize", 16).toInt(); firstColumnHandlePos = s.value("firstColumnHandlePos", 50).toInt(); secondColumnHandlePosFromRight = s.value("secondColumnHandlePosFromRight", 50).toInt();