Merge branch 'games_branch'

Frankz · Oct 3, 2016 · 79a9095 · 79a9095
2 parents 9fdd751 + b600050
commit 79a9095
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Telegram/SourceFiles/boxes/report_box.cpp b/Telegram/SourceFiles/boxes/report_box.cpp
@@ -83,11 +83,11 @@ void ReportBox::onChange() {
 			connect(_reasonOtherText, SIGNAL(submitted(bool)), this, SLOT(onReport()));
 			connect(_reasonOtherText, SIGNAL(cancelled()), this, SLOT(onClose()));
 		}
+		_reasonOtherText->setFocus();
 	} else if (_reasonOtherText) {
 		_reasonOtherText.destroy();
 		updateMaxHeight();
 	}
-	_reasonOtherText->setFocus();
 }
 
 void ReportBox::doSetInnerFocus() {

diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
@@ -2011,10 +2011,11 @@ bool HistoryService::prepareGameScoreText(const QString &from, QString *outText,
 	} else {
 		gameTitle = lang(lng_deleted_message);
 	}
+	auto scoreNumber = gamescore ? gamescore->score : 0;
 	if (_from->isSelf()) {
-		*outText = lng_action_game_you_scored(lt_count, gamescore->score, lt_game, gameTitle);
+		*outText = lng_action_game_you_scored(lt_count, scoreNumber, lt_game, gameTitle);
 	} else {
-		*outText = lng_action_game_score(lt_from, from, lt_count, gamescore->score, lt_game, gameTitle);
+		*outText = lng_action_game_score(lt_from, from, lt_count, scoreNumber, lt_game, gameTitle);
 	}
 	if (second) {
 		outLinks->push_back(second);
@@ -2212,12 +2213,13 @@ HistoryTextState HistoryService::getState(int x, int y, HistoryStateRequest requ
 }
 
 void HistoryService::createFromMtp(const MTPDmessageService &message) {
+	if (message.vaction.type() == mtpc_messageActionGameScore) {
+		UpdateComponents(HistoryServiceGameScore::Bit());
+		Get<HistoryServiceGameScore>()->score = message.vaction.c_messageActionGameScore().vscore.v;
+	}
 	if (message.has_reply_to_msg_id()) {
 		if (message.vaction.type() == mtpc_messageActionPinMessage) {
 			UpdateComponents(HistoryServicePinned::Bit());
-		} else if (message.vaction.type() == mtpc_messageActionGameScore) {
-			UpdateComponents(HistoryServiceGameScore::Bit());
-			Get<HistoryServiceGameScore>()->score = message.vaction.c_messageActionGameScore().vscore.v;
 		}
 		if (auto dependent = GetDependentData()) {
 			dependent->msgId = message.vreply_to_msg_id.v;