diff options
| author | Memphiz <memphis@machzwo.de> | 2013-08-03 09:37:32 -0700 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-08-03 09:37:32 -0700 |
| commit | 60965df94e27a9a34884bb679b857c2e5cd233fe (patch) | |
| tree | 7e410a45f0edb45ece21ce1c4edf5f16218502f4 | |
| parent | 77295c64c27051a9e3496826f62cba4b138f32e2 (diff) | |
| parent | 84a8264e2e66d292dd38ce75e8c0f4a418e412f1 (diff) | |
Merge pull request #3027 from Memphiz/fixautoclose
[guidialog] - fix autoclose
| -rw-r--r-- | xbmc/guilib/GUIDialog.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/xbmc/guilib/GUIDialog.cpp b/xbmc/guilib/GUIDialog.cpp index 79434c8abe..83d3b3bfb4 100644 --- a/xbmc/guilib/GUIDialog.cpp +++ b/xbmc/guilib/GUIDialog.cpp @@ -142,6 +142,23 @@ void CGUIDialog::UpdateVisibility() else Close(); } + + if (m_autoClosing) + { // check if our timer is running + if (!m_showStartTime) + { + if (HasProcessed()) // start timer + m_showStartTime = CTimeUtils::GetFrameTime(); + } + else + { + if (m_showStartTime + m_showDuration < CTimeUtils::GetFrameTime() && !m_closing) + { + m_bAutoClosed = true; + Close(); + } + } + } } void CGUIDialog::DoModal_Internal(int iWindowID /*= WINDOW_INVALID */, const CStdString ¶m /* = "" */) @@ -230,22 +247,6 @@ void CGUIDialog::Show() void CGUIDialog::FrameMove() { - if (m_autoClosing) - { // check if our timer is running - if (!m_showStartTime) - { - if (HasProcessed()) // start timer - m_showStartTime = CTimeUtils::GetFrameTime(); - } - else - { - if (m_showStartTime + m_showDuration < CTimeUtils::GetFrameTime() && !m_closing) - { - m_bAutoClosed = true; - Close(); - } - } - } CGUIWindow::FrameMove(); } |