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 'pr1397'

Browse Source
This commit is contained in:
Dubslow 2015-03-16 17:47:15 -05:00
commit 42fe29e83d
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
1 changed files with 9 additions and 2 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"
@ -329,6 +330,12 @@ 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() << "GeneralForm::reloadSmilies: No emoticons found";
return;
}
QStringList smiles; QStringList smiles;
for (int i = 0; i < emoticons.size(); i++) for (int i = 0; i < emoticons.size(); i++)
smiles.push_front(emoticons.at(i).first()); smiles.push_front(emoticons.at(i).first());