From ae385fb61cd8caa1024359f71f2e77a41ddb6e58 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Wed, 13 Feb 2013 07:50:41 +0000
Subject: [PATCH] Correction for fix #34205: Zooming in rendered mode during
 update out of sync with intended zoom

Didn't initially notice one possibility when GPU render would fail here,
---
 intern/cycles/render/session.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 7a40e0d04b6..6ed14452c6b 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -210,7 +210,12 @@ void Session::run_gpu()
 			 * wait for pause condition notify to wake up again */
 			thread_scoped_lock pause_lock(pause_mutex);
 
-			if(pause || no_tiles) {
+			if(!pause && !tile_manager.done()) {
+				/* reset could have happened after no_tiles was set, before this lock.
+				 * in this case we shall not wait for pause condition
+				 */
+			}
+			else if(pause || no_tiles) {
 				update_status_time(pause, no_tiles);
 
 				while(1) {