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

Merge remote-tracking branch 'thenain38/fix-User-display-name-empty'

This commit is contained in:
agilob 2015-10-10 12:46:07 +01:00
commit 375c34c079
No known key found for this signature in database
GPG Key ID: 296F0B764741106C

View File

@ -58,6 +58,9 @@ void Friend::loadHistory()
void Friend::setName(QString name)
{
if (name.isEmpty())
name = userID.publicKey;
userName = name;
if (userAlias.size() == 0)
{