From 00ad9d59ca716c5b7ee3872ddb5a9ed8149c707e Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Thu, 21 Jul 2016 20:03:47 -0400
Subject: [PATCH] Better fix to Mac user getting logged out after the app is
 locked.

---
 MasterPassword/ObjC/Mac/MPMacAppDelegate.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
index d0a2d2b1..23873b15 100644
--- a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
+++ b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m
@@ -183,7 +183,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
     [super setActiveUser:activeUser];
 
-    [MPMacConfig get].usedUserName = activeUser.name;
+    if (activeUser)
+        [MPMacConfig get].usedUserName = activeUser.name;
 
     PearlMainQueue( ^{
         [self updateUsers];