From 64afed0fb268fb0f6d4c2d6eef7786f6424868e5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 4 Feb 2019 19:04:36 +0300 Subject: [PATCH] Fix crash for videos without thumbnails. --- Telegram/SourceFiles/mediaview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 3e6e43c2e..cc680da93 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -1830,10 +1830,10 @@ void MediaView::createClipReader() { ? _doc->thumbnail() : Image::Blank().get())->pixNoCache(fileOrigin(), w, h, VideoThumbOptions(_doc), w / cIntRetinaFactor(), h / cIntRetinaFactor()); _current.setDevicePixelRatio(cRetinaFactor()); + } else if (_doc->hasThumbnail()) { + _current = _doc->thumbnail()->pixNoCache(fileOrigin(), _doc->thumbnail()->width(), _doc->thumbnail()->height(), VideoThumbOptions(_doc), st::mediaviewFileIconSize, st::mediaviewFileIconSize); } else { - _current = (_doc->hasThumbnail() - ? _doc->thumbnail() - : Image::Blank().get())->pixNoCache(fileOrigin(), _doc->thumbnail()->width(), _doc->thumbnail()->height(), VideoThumbOptions(_doc), st::mediaviewFileIconSize, st::mediaviewFileIconSize); + _current = Image::Blank()->pixNoCache({}, Image::Blank()->width(), Image::Blank()->height(), VideoThumbOptions(_doc), st::mediaviewFileIconSize, st::mediaviewFileIconSize); } auto mode = (_doc->isVideoFile() || _doc->isVideoMessage()) ? Media::Clip::Reader::Mode::Video