mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

CHintBox: move showTimeOutBar() to protected, add params to enableTimeOutBar()

Browse Source 
Explicit call of disableTimeOutBar() after exec() is required to ensure
we have no timebar opened objects. I'm not shure, but otherwise crashs
could be possible.

showTimeOutBar() is required for OnTimer(). It doesn't need any
parameter.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a80b861cb5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-10-25 08:53:23 +02:00
parent a365c01482
commit 0bee2b3f1c
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,17 +168,21 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string
CHintBox::~CHintBox()
{
if(timeout_pb){
timeout_pb->kill(); //ensure cleanup from screen
delete timeout_pb; timeout_pb = NULL;
}
if(timeout_pb_timer){
delete timeout_pb_timer; timeout_pb_timer = NULL;
}
disableTimeOutBar();
}
void CHintBox::showTimeOutBar()
void CHintBox::enableTimeOutBar(bool enable)
{
if(!enable){
if(timeout_pb_timer){
delete timeout_pb_timer; timeout_pb_timer = NULL;
}
if(timeout_pb){
delete timeout_pb; timeout_pb = NULL;
}
return;
}
if(timeout_pb){
timeout_pb->paint0();
timeout_pb->setValues(timeout_pb->getValue()+1, 100*timeout);
@@ -201,7 +205,7 @@ int CHintBox::exec()
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
if (timeout > 0)
showTimeOutBar();
enableTimeOutBar();
while ( ! ( res & ( messages_return::cancel_info | messages_return::cancel_all ) ) )
{
@@ -244,6 +248,8 @@ int CHintBox::exec()
}
}
}
disableTimeOutBar();
return res;
}