mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

hintbox: fix enable/disable timeout bar

Browse Source 
enable_timeout_bar was not considered within exec().
Each try to disable timeout bar (eg. with enableTimeOutBar())
was without effect.
This commit is contained in:
Thilo Graf
2020-02-13 18:40:18 +01:00
parent c13df6800b
commit 3f121c868e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/widget/hintbox.cpp
View File

@@ -208,10 +208,12 @@ CHintBox::~CHintBox()
void CHintBox::enableTimeOutBar(bool enable) void CHintBox::enableTimeOutBar(bool enable)
{ {
if(!enable_timeout_bar){ if (!enable_timeout_bar || !enable)
{
if(timeout_pb_timer){ if(timeout_pb_timer){
delete timeout_pb_timer; timeout_pb_timer = NULL; delete timeout_pb_timer; timeout_pb_timer = NULL;
} }
if(timeout_pb){ if(timeout_pb){
timeout_pb->setValues(100, 100); timeout_pb->setValues(100, 100);
timeout_pb->paint0(); timeout_pb->paint0();
@@ -220,7 +222,6 @@ void CHintBox::enableTimeOutBar(bool enable)
} }
return; return;
} }
else
if (enable_timeout_bar && enable) if (enable_timeout_bar && enable)
{ {
@@ -228,8 +229,10 @@ void CHintBox::enableTimeOutBar(bool enable)
timeout_pb->setValues(timeout_pb->getValue()+1, 10*timeout); timeout_pb->setValues(timeout_pb->getValue()+1, 10*timeout);
timeout_pb->paint0(); timeout_pb->paint0();
}else{ }else{
timeout_pb = new CProgressBar(); if (!timeout_pb){
timeout_pb->setType(CProgressBar::PB_TIMESCALE); timeout_pb = new CProgressBar();
timeout_pb->setType(CProgressBar::PB_TIMESCALE);
}
timeout_pb->setDimensionsAll(ccw_body->getRealXPos(), ccw_body->getRealYPos(), ccw_body->getWidth(), TIMEOUT_BAR_HEIGHT); timeout_pb->setDimensionsAll(ccw_body->getRealXPos(), ccw_body->getRealYPos(), ccw_body->getWidth(), TIMEOUT_BAR_HEIGHT);
timeout_pb->setValues(timeout/10, timeout); timeout_pb->setValues(timeout/10, timeout);
if (!timeout_pb_timer) { if (!timeout_pb_timer) {
@@ -255,8 +258,7 @@ int CHintBox::exec()
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
if (timeout > 0) enableTimeOutBar(timeout > 0);
enableTimeOutBar();
while ( ! ( res & ( messages_return::cancel_info | messages_return::cancel_all ) ) ) while ( ! ( res & ( messages_return::cancel_info | messages_return::cancel_all ) ) )
{ {