From 23ecd83e73aa58555e1b1156bcb02d9ee747358a Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Tue, 3 Jan 2017 20:07:19 -0600
Subject: [PATCH] =?UTF-8?q?Fixes=20issue=20where=20GameViewController?=
 =?UTF-8?q?=E2=80=99s=20ControllerView=20remained=20visible=20after=20conn?=
 =?UTF-8?q?ecting=20MFi=20controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cores/DeltaCore                          |  2 +-
 Delta/Emulation/GameViewController.swift | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index 55ea133..3a78b44 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit 55ea13366edc40bb7cd9978c6127bd4f49aa45d1
+Subproject commit 3a78b44803610e9dd9e71cd1c1a8d573eb79362a
diff --git a/Delta/Emulation/GameViewController.swift b/Delta/Emulation/GameViewController.swift
index c48f7ff..a413a5e 100644
--- a/Delta/Emulation/GameViewController.swift
+++ b/Delta/Emulation/GameViewController.swift
@@ -344,6 +344,12 @@ private extension GameViewController
         if let index = Settings.localControllerPlayerIndex
         {
             self.controllerView.playerIndex = index
+            self.controllerView.isHidden = false
+        }
+        else
+        {
+            self.controllerView.playerIndex = nil
+            self.controllerView.isHidden = true
         }
         
         var controllers = [GameController]()
@@ -368,6 +374,7 @@ private extension GameViewController
         }
         
         self.view.setNeedsLayout()
+        self.view.layoutIfNeeded()
     }
     
     func updateControllerSkin()
@@ -775,6 +782,8 @@ private extension GameViewController
         
         switch settingsName
         {
+        case .localControllerPlayerIndex: self.updateControllers()
+            
         case .preferredControllerSkin:
             guard
                 let gameType = notification.userInfo?[Settings.NotificationUserInfoKey.gameType] as? GameType,
@@ -795,9 +804,6 @@ private extension GameViewController
                     self.controllerView.alpha = Settings.translucentControllerSkinOpacity
                 }
             }
-            
-            
-        default: break
         }
     }
 }