From 45e83d06c2a42ceb557e1765b15b9200853fcfae Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Sat, 4 Jun 2016 20:18:32 +0600 Subject: CLOUD: Fix CloudIcon It's not a Request again, but still it controls ConnMan's timer. --- backends/networking/curl/cloudicon.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'backends/networking/curl/cloudicon.cpp') diff --git a/backends/networking/curl/cloudicon.cpp b/backends/networking/curl/cloudicon.cpp index 3304c71b98..dfb870a2c6 100644 --- a/backends/networking/curl/cloudicon.cpp +++ b/backends/networking/curl/cloudicon.cpp @@ -34,13 +34,13 @@ const float CloudIcon::ALPHA_STEP = 0.03; const float CloudIcon::ALPHA_MAX = 1; const float CloudIcon::ALPHA_MIN = 0.5; -CloudIcon::CloudIcon(): Request(nullptr, nullptr), _wasVisible(false), _iconsInited(false), _currentAlpha(0), _alphaRising(true) { +CloudIcon::CloudIcon(): _wasVisible(false), _iconsInited(false), _currentAlpha(0), _alphaRising(true) { initIcons(); } CloudIcon::~CloudIcon() {} -void CloudIcon::draw() { +bool CloudIcon::draw() { initIcons(); Cloud::Storage *storage = CloudMan.getCurrentStorage(); @@ -71,7 +71,7 @@ void CloudIcon::draw() { _currentAlpha -= 3 * ALPHA_STEP; if (_currentAlpha <= 0) { _currentAlpha = 0; - finish(); + return true; } } @@ -84,13 +84,8 @@ void CloudIcon::draw() { g_system->copyRectToOSD(surface->getPixels(), surface->pitch, x, y, surface->w, surface->h); } } -} - -void CloudIcon::handle() {} -void CloudIcon::restart() { - _currentAlpha = 0; - _alphaRising = true; + return false; } void CloudIcon::initIcons() { -- cgit v1.2.3