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

fix #1394

Browse Source
This commit is contained in:
sudden6 2015-03-15 13:00:40 +01:00 committed by Dubslow
parent bcbc6bd65f
commit 0c4cc87ed0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widget/form/settings/generalform.cpp
View File

@ -27,6 +27,7 @@
#include <QTime> #include <QTime>
#include <QFileDialog> #include <QFileDialog>
#include <QStandardPaths> #include <QStandardPaths>
#include <QDebug>
#include "src/autoupdate.h" #include "src/autoupdate.h"
@ -313,6 +314,11 @@ void GeneralForm::onReconnectClicked()
void GeneralForm::reloadSmiles() void GeneralForm::reloadSmiles()
{ {
QList<QStringList> emoticons = SmileyPack::getInstance().getEmoticons(); QList<QStringList> emoticons = SmileyPack::getInstance().getEmoticons();
if (emoticons.isEmpty())
// sometimes there are no emoticons available, don't crash in this case
{
qDebug() << "Settings GeneralForm: No emoticons found";
} else {
QStringList smiles; QStringList smiles;
smiles << ":)" << ";)" << ":p" << ":O" << ":["; //just in case... smiles << ":)" << ";)" << ":p" << ":O" << ":["; //just in case...
@ -331,6 +337,7 @@ void GeneralForm::reloadSmiles()
bodyUI->smile3->setToolTip(smiles[2]); bodyUI->smile3->setToolTip(smiles[2]);
bodyUI->smile4->setToolTip(smiles[3]); bodyUI->smile4->setToolTip(smiles[3]);
bodyUI->smile5->setToolTip(smiles[4]); bodyUI->smile5->setToolTip(smiles[4]);
}
} }
void GeneralForm::onCheckUpdateChanged() void GeneralForm::onCheckUpdateChanged()