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 dev

Browse Source 
Conflicts:
	Telegram/SourceFiles/history/history.style
This commit is contained in:
John Preston
2016-07-08 13:26:28 +03:00
parent 8ea47c1811 5c474aee27
commit 2aa35af909
63 changed files with 2063 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -1541,7 +1541,9 @@ void MainWidget::audioPlayProgress(const AudioMsgId &audioId) {
DocumentData *audio = audioId.audio;
QString filepath = audio->filepath(DocumentData::FilePathResolveSaveFromData);
if (!filepath.isEmpty()) {
psOpenFile(filepath);
if (documentIsValidMediaFile(filepath)) {
psOpenFile(filepath);
}
}
}
@@ -1568,7 +1570,9 @@ void MainWidget::documentPlayProgress(const SongMsgId &songId) {
DocumentData *document = songId.song;
QString filepath = document->filepath(DocumentData::FilePathResolveSaveFromData);
if (!filepath.isEmpty()) {
psOpenFile(filepath);
if (documentIsValidMediaFile(filepath)) {
psOpenFile(filepath);
}
}
}