Fixing warning about not being able to invoke some keychain functions…

… on the main thread
H-uru · Oct 1, 2023 · 6cbd11e · 6cbd11e
1 parent f3d2ab3
commit 6cbd11e
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/Sources/Plasma/Apps/plClient/Mac-Cocoa/PLSLoginWindowController.mm b/Sources/Plasma/Apps/plClient/Mac-Cocoa/PLSLoginWindowController.mm
@@ -64,6 +64,7 @@ @interface PLSLoginWindowController ()
 #define FAKE_PASS_STRING @"********"
 
 static NSOperationQueue* _loginQueue = nil;
+static dispatch_queue_t _keychainQueue = dispatch_queue_create(nullptr, DISPATCH_QUEUE_SERIAL);
 
 @implementation PLSLoginController
 
@@ -131,11 +132,13 @@ - (void)save
         ST::string username = [self.username STString];
         ST::string password = [self.password STString];
 
-        pfPasswordStore* store = pfPasswordStore::Instance();
-        if (self.rememberPassword)
-            store->SetPassword(username, password);
-        else
-            store->SetPassword(username, ST::string());
+        dispatch_async(_keychainQueue, ^{
+            pfPasswordStore* store = pfPasswordStore::Instance();
+            if (self.rememberPassword)
+                store->SetPassword(username, password);
+            else
+                store->SetPassword(username, ST::string());
+        });
     }
 }
 
@@ -150,8 +153,10 @@ - (void)load
     if (self.rememberPassword) {
         pfPasswordStore* store = pfPasswordStore::Instance();
         ST::string username = [self.username STString];
-        ST::string password = store->GetPassword(username);
-        self.password = [NSString stringWithSTString:password];
+        dispatch_sync(_keychainQueue, ^{
+            ST::string password = store->GetPassword(username);
+            self.password = [NSString stringWithSTString:password];
+        });
     }
 }