From 90f5f7dded047638dd01aadf991256edae3b968e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Dec 2017 18:15:00 +0400
Subject: [PATCH] Fix possible crash in timer timeout values.

---
 Telegram/SourceFiles/app.cpp                  |  6 +++---
 .../history/history_top_bar_widget.cpp        | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 41d97ea42..1c2e1e7f8 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -257,11 +257,11 @@ namespace {
 
 	int32 onlineWillChangeIn(TimeId online, TimeId now) {
 		if (online <= 0) {
-            if (-online > now) return -online - now;
+			if (-online > now) return std::max(-online - now, 86400);
             return 86400;
         }
 		if (online > now) {
-			return online - now;
+			return std::max(online - now, 86400);
 		}
 		int32 minutes = (now - online) / 60;
 		if (minutes < 60) {
@@ -272,7 +272,7 @@ namespace {
 			return (hours + 1) * 3600 - (now - online);
 		}
 		QDateTime dNow(date(now)), dTomorrow(dNow.date().addDays(1));
-		return dNow.secsTo(dTomorrow);
+		return std::max(dNow.secsTo(dTomorrow), 86400LL);
 	}
 
 	QString onlineText(UserData *user, TimeId now, bool precise) {
diff --git a/Telegram/SourceFiles/history/history_top_bar_widget.cpp b/Telegram/SourceFiles/history/history_top_bar_widget.cpp
index 0b6b30fe8..c1bf60561 100644
--- a/Telegram/SourceFiles/history/history_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/history_top_bar_widget.cpp
@@ -742,17 +742,18 @@ void HistoryTopBarWidget::updateOnlineDisplay() {
 void HistoryTopBarWidget::updateOnlineDisplayTimer() {
 	if (!_historyPeer) return;
 
-	int32 t = unixtime(), minIn = 86400;
-	if (auto user = _historyPeer->asUser()) {
-		minIn = App::onlineWillChangeIn(user, t);
+	const auto now = unixtime();
+	auto minIn = TimeId(86400);
+	const auto handleUser = [&](not_null<UserData*> user) {
+		auto hisMinIn = App::onlineWillChangeIn(user, now);
+		Assert(hisMinIn >= 0 && hisMinIn <= 86400);
+		accumulate_min(minIn, hisMinIn);
+	};
+	if (const auto user = _historyPeer->asUser()) {
+		handleUser(user);
 	} else if (auto chat = _historyPeer->asChat()) {
-		if (chat->participants.empty()) return;
-
 		for (auto [user, v] : chat->participants) {
-			auto onlineWillChangeIn = App::onlineWillChangeIn(user, t);
-			if (onlineWillChangeIn < minIn) {
-				minIn = onlineWillChangeIn;
-			}
+			handleUser(user);
 		}
 	} else if (_historyPeer->isChannel()) {
 	}