RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Crash fix for inline results clearing. Crash fix for GIF starting.

This commit is contained in:
John Preston 2016-08-15 10:39:12 +03:00
parent 247b77c784
commit 05697374c5
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/dropdown.cpp
View File

@ -1725,7 +1725,6 @@ void StickerPanInner::refreshSavedGifs() {
void StickerPanInner::inlineBotChanged() {
_setGifCommand = false;
refreshInlineRows(nullptr, nullptr, true);
deleteUnusedInlineLayouts();
}
void StickerPanInner::clearInlineRows(bool resultsDeleted) {
@ -1942,6 +1941,7 @@ int StickerPanInner::refreshInlineRows(UserData *bot, const InlineCacheEntry *en
if (clearResults()) {
if (resultsDeleted) {
clearInlineRows(true);
deleteUnusedInlineLayouts();
}
emit emptyInlineRows();
return 0;

2
Telegram/SourceFiles/media/media_clip_ffmpeg.h
View File

@ -91,7 +91,7 @@ private:
bool _hadFrame = false;
bool _frameRead = false;
int _audioStreamId = 0;
int _audioStreamId = -1;
uint64 _playId = 0;
int64 _lastReadVideoMs = 0;
int64 _lastReadAudioMs = 0;

11
Telegram/build/build.bat
View File

@ -177,29 +177,18 @@ echo .
set "FinalReleasePath=Z:\TBuild\tother\tsetup"
set "FinalDeployPath=%FinalReleasePath%\%AppVersionStrMajor%\%AppVersionStrFull%"
echo 1
if not exist "%DeployPath%\%UpdateFile%" goto error
echo 2
if not exist "%DeployPath%\%PortableFile%" goto error
echo 3
if %BetaVersion% equ 0 (
if not exist "%DeployPath%\%SetupFile%" goto error
)
echo 4
if not exist "%DeployPath%\%BinaryName%.pdb" goto error
echo 5
if not exist "%DeployPath%\%BinaryName%.exe.pdb" goto error
echo 6
if not exist "%DeployPath%\Updater.exe" goto error
echo 7
if not exist "%DeployPath%\Updater.pdb" goto error
echo 8
if not exist "%DeployPath%\Updater.exe.pdb" goto error
echo 9
if not exist "%FinalReleasePath%\%AppVersionStrMajor%" mkdir "%FinalReleasePath%\%AppVersionStrMajor%"
echo 10
if not exist "%FinalDeployPath%" mkdir "%FinalDeployPath%"
echo 11
xcopy "%DeployPath%\%UpdateFile%" "%FinalDeployPath%\"
xcopy "%DeployPath%\%PortableFile%" "%FinalDeployPath%\"