[geary/wip/713150-conversations: 19/20] Fix possible race condition when filling conversation window

[Jim Nelson <jnelson src gnome org>]

commit bba7c388006494c911fd96229939236b1c63c91d
Author: Jim Nelson <jim yorba org>
Date:   Tue Mar 10 18:46:03 2015 -0700

    Fix possible race condition when filling conversation window

 src/engine/app/app-conversation-monitor.vala |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/engine/app/app-conversation-monitor.vala b/src/engine/app/app-conversation-monitor.vala
index ec7bc94..0ec4464 100644
--- a/src/engine/app/app-conversation-monitor.vala
+++ b/src/engine/app/app-conversation-monitor.vala
@@ -865,7 +865,7 @@ public class Geary.App.ConversationMonitor : BaseObject {
         // Run again to make sure we're full ... precondition checking is relied on to prevent
         // continuous looping of FillWindowOperations
         bool rescheduled = false;
-        if (conversations.size < min_window_count) {
+        if (conversations.size < min_window_count && folder.properties.email_total <= min_window_count) {
             operation_queue.add(new FillWindowOperation(this, false));
             rescheduled = true;
         }