StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr2782'

Browse Source
This commit is contained in:
tux3 2016-01-14 14:03:03 +01:00
commit aeb26d1af7
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/persistence/settings.cpp
View File

@ -192,7 +192,12 @@ void Settings::loadGlobal()
s.endGroup();
s.beginGroup("GUI");
smileyPack = s.value("smileyPack", ":/smileys/Universe/emoticons.xml").toString();
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();