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

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2015-01-28 16:11:20 +03:00
parent 94d1ea7032 75a47e98c3
commit c428008166
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/mainwidget.cpp
View File

@ -2449,7 +2449,8 @@ void MainWidget::updateOnline(bool gotOtherOffline) {
int updateIn = cOnlineUpdatePeriod(); int updateIn = cOnlineUpdatePeriod();
if (isOnline) { if (isOnline) {
uint64 idle = psIdleTime(); uint64 idle = psIdleTime();
if (idle >= cOfflineIdleTimeout()) { LOG(("Idle: %1").arg(idle));
if (idle >= uint64(cOfflineIdleTimeout())) {
isOnline = false; isOnline = false;
if (!_isIdle) { if (!_isIdle) {
_isIdle = true; _isIdle = true;
@ -2476,13 +2477,14 @@ void MainWidget::updateOnline(bool gotOtherOffline) {
updateOnlineDisplay(); updateOnlineDisplay();
} else if (isOnline) { } else if (isOnline) {
updateIn = _lastSetOnline + cOnlineUpdatePeriod() - ms; updateIn = qMin(updateIn, int(_lastSetOnline + cOnlineUpdatePeriod() - ms));
} }
LOG(("UPDATE IN: %1").arg(updateIn));
_onlineTimer.start(updateIn); _onlineTimer.start(updateIn);
} }
void MainWidget::checkIdleFinish() { void MainWidget::checkIdleFinish() {
if (psIdleTime() < cOfflineIdleTimeout()) { if (psIdleTime() < uint64(cOfflineIdleTimeout())) {
_idleFinishTimer.stop(); _idleFinishTimer.stop();
_isIdle = false; _isIdle = false;
updateOnline(); updateOnline();

1
Telegram/SourceFiles/pspecific_mac.h
View File

@ -89,7 +89,6 @@ public slots:
void psUpdateDelegate(); void psUpdateDelegate();
void psSavePosition(Qt::WindowState state = Qt::WindowActive); void psSavePosition(Qt::WindowState state = Qt::WindowActive);
void psIdleTimeout();
void psShowTrayMenu(); void psShowTrayMenu();
void psMacUndo(); void psMacUndo();