From ffe17a3fcc82d88b7e56ea2da5a46c320b2bcfd1 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Wed, 16 May 2018 10:28:51 -0400
Subject: [PATCH] add guard to avoid redundant show, fix logic in existing
 guard when hiding.

// FREEBIE
---
 Signal/src/util/OWSWindowManager.m | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Signal/src/util/OWSWindowManager.m b/Signal/src/util/OWSWindowManager.m
index 1609990d3..dc7456d19 100644
--- a/Signal/src/util/OWSWindowManager.m
+++ b/Signal/src/util/OWSWindowManager.m
@@ -330,6 +330,11 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
 {
     OWSAssertIsOnMainThread();
 
+    if (!self.returnToCallWindow.hidden) {
+        return;
+    }
+
+    DDLogInfo(@"%@ showing 'return to call' window.", self.logTag);
     self.returnToCallWindow.hidden = NO;
     [self.returnToCallViewController startAnimating];
 }
@@ -338,10 +343,11 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
 {
     OWSAssertIsOnMainThread();
 
-    if (!self.returnToCallWindow.hidden) {
-        DDLogInfo(@"%@ hiding 'return to call' window.", self.logTag);
+    if (self.returnToCallWindow.hidden) {
+        return;
     }
 
+    DDLogInfo(@"%@ hiding 'return to call' window.", self.logTag);
     self.returnToCallWindow.hidden = YES;
     [self.returnToCallViewController stopAnimating];
 }