Skip to content
This repository
Browse code

Merge pull request #3027 from Memphiz/fixautoclose

[guidialog] - fix autoclose
  • Loading branch information...
commit 60965df94e27a9a34884bb679b857c2e5cd233fe 2 parents 77295c6 + 84a8264
Memphiz authored August 03, 2013

Showing 1 changed file with 17 additions and 16 deletions. Show diff stats Hide diff stats

  1. 33  xbmc/guilib/GUIDialog.cpp
33  xbmc/guilib/GUIDialog.cpp
@@ -142,6 +142,23 @@ void CGUIDialog::UpdateVisibility()
142 142
     else
143 143
       Close();
144 144
   }
  145
+  
  146
+  if (m_autoClosing)
  147
+  { // check if our timer is running
  148
+    if (!m_showStartTime)
  149
+    {
  150
+      if (HasProcessed()) // start timer
  151
+        m_showStartTime = CTimeUtils::GetFrameTime();
  152
+    }
  153
+    else
  154
+    {
  155
+      if (m_showStartTime + m_showDuration < CTimeUtils::GetFrameTime() && !m_closing)
  156
+      {
  157
+        m_bAutoClosed = true;
  158
+        Close();
  159
+      }
  160
+    }
  161
+  }
145 162
 }
146 163
 
147 164
 void CGUIDialog::DoModal_Internal(int iWindowID /*= WINDOW_INVALID */, const CStdString &param /* = "" */)
@@ -230,22 +247,6 @@ void CGUIDialog::Show()
230 247
 
231 248
 void CGUIDialog::FrameMove()
232 249
 {
233  
-  if (m_autoClosing)
234  
-  { // check if our timer is running
235  
-    if (!m_showStartTime)
236  
-    {
237  
-      if (HasProcessed()) // start timer
238  
-        m_showStartTime = CTimeUtils::GetFrameTime();
239  
-    }
240  
-    else
241  
-    {
242  
-      if (m_showStartTime + m_showDuration < CTimeUtils::GetFrameTime() && !m_closing)
243  
-      {
244  
-        m_bAutoClosed = true;
245  
-        Close();
246  
-      }
247  
-    }
248  
-  }
249 250
   CGUIWindow::FrameMove();
250 251
 }
251 252
 

0 notes on commit 60965df

Please sign in to comment.
Something went wrong with that request. Please try again.