Ensured that inserConnect() is only called when the widget is visible

- added new method RsautoUpdatePage::securedUpdatePage()
- made insertConnect() private to disallow connecting it with callbacks in notifyQt.cpp
- this should also correct some possible deadlocks in passphrase handling
Needs full recompile + qmake of GUI



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-05-21 12:55:03 +00:00
parent 469b37aa60
commit bb916ad1cc
5 changed files with 27 additions and 19 deletions

View file

@ -23,6 +23,14 @@ RsAutoUpdatePage::~RsAutoUpdatePage()
_timer = NULL ;
}
void RsAutoUpdatePage::securedUpdateDisplay()
{
if(_locked == false && isVisible()) {
updateDisplay();
update() ; // Qt flush
}
}
void RsAutoUpdatePage::showEvent(QShowEvent */*event*/)
{
//std::cout << "RsAutoUpdatePage::showEvent() In show event !!" << std::endl ;
@ -34,14 +42,11 @@ void RsAutoUpdatePage::timerUpdate()
{
// only update when the widget is visible.
//
if(_locked == false && isVisible()) {
updateDisplay();
update() ; // Qt flush
}
securedUpdateDisplay() ;
_timer->start() ;
}
void RsAutoUpdatePage::lockAllEvents() { _locked = true ; }
void RsAutoUpdatePage::unlockAllEvents() { _locked = false ; }
bool RsAutoUpdatePage::eventsLocked() { return _locked ; }