From ee9cdaff901f40f596c423158a113bfd23fdd624 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 6 Jul 2017 23:26:40 -0700
Subject: [PATCH 1/2] Set admin status even if QML can't find user in PAL

---
 interface/resources/qml/hifi/Pal.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index bbb42e61ac..e300af98b4 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -1099,9 +1099,9 @@ Rectangle {
         case 'nearbyUsers':
             var data = message.params;
             var index = -1;
+            iAmAdmin = Users.canKick;
             index = findNearbySessionIndex('', data);
             if (index !== -1) {
-                iAmAdmin = Users.canKick;
                 myData = data[index];
                 data.splice(index, 1);
             } else {

From ea77557e387500c6342077d6344f05cbe9a3d678 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 7 Jul 2017 08:08:52 -0700
Subject: [PATCH 2/2] Correctly close PAL when switching domains

---
 scripts/system/pal.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index 0500c13f9b..264066558e 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -865,6 +865,9 @@ function avatarDisconnected(nodeID) {
 
 function clearLocalQMLDataAndClosePAL() {
     sendToQml({ method: 'clearLocalQMLData' });
+    if (onPalScreen) {
+        tablet.gotoHomeScreen();
+    }
 }
 
 function avatarAdded(avatarID) {