From dca5e0ae837a798812069f966af4f1ba0fb7da97 Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@pelagicore.com>
Date: Mon, 23 Mar 2015 13:38:28 +0100
Subject: Another fix to avoid detaching the m_windows list.

Just like commit 310fd3ed, this fixes another unnecessary detach.

Change-Id: I5108ea5112a4b0e877f86d06868375abb9a80409
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
---
 src/quick/scenegraph/qsgthreadedrenderloop.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/quick/scenegraph/qsgthreadedrenderloop.cpp')

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index e1a54810b7..7b1e24246b 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -767,9 +767,9 @@ void QSGThreadedRenderLoop::animationStopped()
 void QSGThreadedRenderLoop::startOrStopAnimationTimer()
 {
     int exposedWindows = 0;
-    Window *theOne = 0;
+    const Window *theOne = 0;
     for (int i=0; i<m_windows.size(); ++i) {
-        Window &w = m_windows[i];
+        const Window &w = m_windows.at(i);
         if (w.window->isVisible() && w.window->isExposed()) {
             ++exposedWindows;
             theOne = &w;
@@ -781,7 +781,7 @@ void QSGThreadedRenderLoop::startOrStopAnimationTimer()
         m_animation_timer = 0;
         // If animations are running, make sure we keep on animating
         if (m_animation_driver->isRunning())
-            maybePostPolishRequest(theOne);
+            maybePostPolishRequest(const_cast<Window *>(theOne));
 
     } else if (m_animation_timer == 0 && exposedWindows != 1 && m_animation_driver->isRunning()) {
         m_animation_timer = startTimer(qsgrl_animation_interval());
-- 
cgit v1.2.3