Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3027 from Memphiz/fixautoclose

[guidialog] - fix autoclose
  • Loading branch information...
commit 60965df94e27a9a34884bb679b857c2e5cd233fe 2 parents 77295c6 + 84a8264
@Memphiz Memphiz authored
Showing with 17 additions and 16 deletions.
  1. +17 −16 xbmc/guilib/GUIDialog.cpp
View
33 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 &param /* = "" */)
@@ -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();
}
Please sign in to comment.
Something went wrong with that request. Please try again.