procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix possible crash in timer timeout values.

This commit is contained in:
John Preston 2017-12-08 18:15:00 +04:00
parent aef88559e8
commit 90f5f7dded
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/app.cpp
View File

@ -257,11 +257,11 @@ namespace {
int32 onlineWillChangeIn(TimeId online, TimeId now) { int32 onlineWillChangeIn(TimeId online, TimeId now) {
if (online <= 0) { if (online <= 0) {
if (-online > now) return -online - now; if (-online > now) return std::max(-online - now, 86400);
return 86400; return 86400;
} }
if (online > now) { if (online > now) {
return online - now; return std::max(online - now, 86400);
} }
int32 minutes = (now - online) / 60; int32 minutes = (now - online) / 60;
if (minutes < 60) { if (minutes < 60) {
@ -272,7 +272,7 @@ namespace {
return (hours + 1) * 3600 - (now - online); return (hours + 1) * 3600 - (now - online);
} }
QDateTime dNow(date(now)), dTomorrow(dNow.date().addDays(1)); 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) { QString onlineText(UserData *user, TimeId now, bool precise) {

19
Telegram/SourceFiles/history/history_top_bar_widget.cpp
View File

@ -742,17 +742,18 @@ void HistoryTopBarWidget::updateOnlineDisplay() {
void HistoryTopBarWidget::updateOnlineDisplayTimer() { void HistoryTopBarWidget::updateOnlineDisplayTimer() {
if (!_historyPeer) return; if (!_historyPeer) return;
int32 t = unixtime(), minIn = 86400; const auto now = unixtime();
if (auto user = _historyPeer->asUser()) { auto minIn = TimeId(86400);
minIn = App::onlineWillChangeIn(user, t); 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()) { } else if (auto chat = _historyPeer->asChat()) {
if (chat->participants.empty()) return;
for (auto [user, v] : chat->participants) { for (auto [user, v] : chat->participants) {
auto onlineWillChangeIn = App::onlineWillChangeIn(user, t); handleUser(user);
if (onlineWillChangeIn < minIn) {
minIn = onlineWillChangeIn;
}
} }
} else if (_historyPeer->isChannel()) { } else if (_historyPeer->isChannel()) {
} }