From 75a47e98c303393a4017fd65e2e00da7337c6c91 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 26 Jan 2015 17:14:52 +0300 Subject: [PATCH] fixed offline-in-30-seconds on no activity --- Telegram/SourceFiles/mainwidget.cpp | 8 +++++--- Telegram/SourceFiles/pspecific_mac.h | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index ed6169f27..f4c02637f 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -2448,7 +2448,8 @@ void MainWidget::updateOnline(bool gotOtherOffline) { int updateIn = cOnlineUpdatePeriod(); if (isOnline) { uint64 idle = psIdleTime(); - if (idle >= cOfflineIdleTimeout()) { + LOG(("Idle: %1").arg(idle)); + if (idle >= uint64(cOfflineIdleTimeout())) { isOnline = false; if (!_isIdle) { _isIdle = true; @@ -2475,13 +2476,14 @@ void MainWidget::updateOnline(bool gotOtherOffline) { updateOnlineDisplay(); } else if (isOnline) { - updateIn = _lastSetOnline + cOnlineUpdatePeriod() - ms; + updateIn = qMin(updateIn, int(_lastSetOnline + cOnlineUpdatePeriod() - ms)); } + LOG(("UPDATE IN: %1").arg(updateIn)); _onlineTimer.start(updateIn); } void MainWidget::checkIdleFinish() { - if (psIdleTime() < cOfflineIdleTimeout()) { + if (psIdleTime() < uint64(cOfflineIdleTimeout())) { _idleFinishTimer.stop(); _isIdle = false; updateOnline(); diff --git a/Telegram/SourceFiles/pspecific_mac.h b/Telegram/SourceFiles/pspecific_mac.h index 7d7da05a7..9d5680e32 100644 --- a/Telegram/SourceFiles/pspecific_mac.h +++ b/Telegram/SourceFiles/pspecific_mac.h @@ -89,7 +89,6 @@ public slots: void psUpdateDelegate(); void psSavePosition(Qt::WindowState state = Qt::WindowActive); - void psIdleTimeout(); void psShowTrayMenu(); void psMacUndo();