From b699d40645912a87ec54128641557430f20c528a Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Thu, 30 Sep 2010 15:24:07 +0200
Subject: RED-576: SNOW-415: Viewer prints always "WARNING: cleanup: Quitting
 with pending background tasks"

See http://redmine.imprudenceviewer.org/issues/576
---
 linden/indra/newview/llappviewer.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 0fbcafc..e6b4831 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1457,8 +1457,11 @@ bool LLAppViewer::cleanup()
 		pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread
 		pending += LLVFSThread::updateClass(0);
 		pending += LLLFSThread::updateClass(0);
-		F64 idle_time = idleTimer.getElapsedTimeF64();
-		if (!pending || idle_time >= max_idle_time)
+		if (pending == 0)
+		{
+			break;
+		}
+		if (idleTimer.getElapsedTimeF64() >= max_idle_time)
 		{
 			llwarns << "Quitting with pending background tasks." << llendl;
 			break;
-- 
cgit v1.1