From 09e56f7dd41e60f2e81923764206d649c86de47c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 21 Nov 2018 00:00:18 +0100 Subject: [PATCH] src/gui/screensaver.cpp: avoid create clock instance if not required Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/badb45b646e38d896656dd466ffbfd2fb9e39503 Author: Thilo Graf Date: 2018-11-21 (Wed, 21 Nov 2018) --- src/gui/screensaver.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp index fc98bcd3f..d4b4934df 100644 --- a/src/gui/screensaver.cpp +++ b/src/gui/screensaver.cpp @@ -298,8 +298,12 @@ void CScreenSaver::paint() { if (scr_clock) { - scr_clock->Stop(); scr_clock->kill(); + scr_clock->allowPaint(false); + if (g_settings.screensaver_mode == SCR_MODE_IMAGE){ + delete scr_clock; + scr_clock = NULL; + } } if (g_settings.screensaver_mode == SCR_MODE_IMAGE && v_bg_files.empty()) m_frameBuffer->paintBackground(); @@ -342,6 +346,7 @@ void CScreenSaver::paint() int x_random = rand() % ((g_settings.screen_EndX - w_cl - g_settings.screen_StartX) + 1) + g_settings.screen_StartX; int y_random = rand() % ((g_settings.screen_EndY - h_cl - g_settings.screen_StartY) + 1) + g_settings.screen_StartY; scr_clock->setPos(x_random, y_random); + scr_clock->allowPaint(true); if (!scr_clock->isRun()) scr_clock->Start();