1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr712'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-11 17:33:37 +01:00
commit b5bcef2c42
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -849,6 +849,11 @@ void Settings::setFriendAlias(const ToxID &id, const QString &alias)
if (it != friendLst.end()) if (it != friendLst.end())
{ {
it->alias = alias; it->alias = alias;
} else {
friendProp fp;
fp.addr = key;
fp.alias = alias;
friendLst[key] = fp;
} }
} }