mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into video

Browse Source 
Conflicts:
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/ui/animation.cpp
	Telegram/Telegram.pro
This commit is contained in:
John Preston
2016-07-11 21:12:10 +03:00
parent 356b48bcca 5c474aee27
commit d806d079a2
65 changed files with 1990 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -1545,8 +1545,6 @@ void MainWidget::audioPlayProgress(const AudioMsgId &audioId) {
if (!filepath.isEmpty()) {
if (documentIsValidMediaFile(filepath)) {
psOpenFile(filepath);
} else {
psShowInFolder(filepath);
}
}
}