mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
John Preston
2016-12-30 17:50:59 +04:00
parent 2e4426aac0 19b77ee4ac
commit b2414939c9
14 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/boxes/addcontactbox.cpp
View File

@@ -560,6 +560,9 @@ void GroupInfoBox::notifyFileQueryUpdated(const FileDialog::QueryUpdate &update)
return;
}
_setPhotoFileQueryId = 0;
if (update.remoteContent.isEmpty() && update.filePaths.isEmpty()) {
return;
}
QImage img;
if (!update.remoteContent.isEmpty()) {