From 2cefccc6ebd6ee4b1466f495cc597aabfcc60ac9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Mar 2020 13:48:29 +0400
Subject: [PATCH] Start with the end Dice animation in forwarded.

---
 .../history/view/media/history_view_dice.cpp  | 24 +++++++++++--------
 .../history/view/media/history_view_dice.h    |  3 +--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
index 0f780802d..dd23adf02 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/stickers_dice_pack.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/view/history_view_element.h"
 #include "main/main_session.h"
 
@@ -28,7 +29,12 @@ Dice::Dice(not_null<Element*> parent, int value)
 : _parent(parent)
 , _start(parent, Lookup(parent, 0))
 , _value(value) {
-	_start.setDiceIndex(0);
+	_showLastFrame = _parent->data()->Has<HistoryMessageForwarded>();
+	if (_showLastFrame) {
+		_drawingEnd = true;
+	} else {
+		_start.setDiceIndex(0);
+	}
 }
 
 Dice::~Dice() = default;
@@ -38,19 +44,17 @@ QSize Dice::size() {
 }
 
 void Dice::draw(Painter &p, const QRect &r, bool selected) {
-	Expects(_end.has_value() || !_drawingEnd);
-
+	if (!_end && _value) {
+		if (const auto document = Lookup(_parent, _value)) {
+			_end.emplace(_parent, document);
+			_end->setDiceIndex(_value);
+			_end->initSize();
+		}
+	}
 	if (_drawingEnd) {
 		_end->draw(p, r, selected);
 	} else {
 		_start.draw(p, r, selected);
-		if (!_end && _value) {
-			if (const auto document = Lookup(_parent, _value)) {
-				_end.emplace(_parent, document);
-				_end->setDiceIndex(_value);
-				_end->initSize();
-			}
-		}
 		if (_end && _end->readyToDrawLottie() && _start.atTheEnd()) {
 			_drawingEnd = true;
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.h b/Telegram/SourceFiles/history/view/media/history_view_dice.h
index 1afb1c08e..e61da58b1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_dice.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_dice.h
@@ -21,7 +21,6 @@ public:
 	void draw(Painter &p, const QRect &r, bool selected) override;
 
 	void clearStickerLoopPlayed() override {
-		_lottieOncePlayed = false;
 	}
 	void unloadHeavyPart() override {
 		_start.unloadHeavyPart();
@@ -38,7 +37,7 @@ private:
 	std::optional<Sticker> _end;
 	Sticker _start;
 	int _value = 0;
-	mutable bool _lottieOncePlayed = false;
+	mutable bool _showLastFrame = false;
 	mutable bool _drawingEnd = false;
 
 };