Fix getting app delegate from background thread

hjuutilainen · Aug 26, 2019 · ebf56a1 · ebf56a1
1 parent 125371c
commit ebf56a1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/MunkiAdmin/NSOperation Subclasses/MAManifestScanner.m b/MunkiAdmin/NSOperation Subclasses/MAManifestScanner.m
@@ -457,7 +457,7 @@ - (void)scan {
 	@try {
 		@autoreleasepool {
 
-            MAMunkiAdmin_AppDelegate *appDelegate = (MAMunkiAdmin_AppDelegate *)[NSApp delegate];
+            MAMunkiAdmin_AppDelegate *appDelegate = (MAMunkiAdmin_AppDelegate *)self.delegate;
 			NSManagedObjectContext *privateContext = self.context;
 			self.currentJobDescription = [NSString stringWithFormat:@"Reading manifest %@", self.fileName];
 

diff --git a/MunkiAdmin/NSOperation Subclasses/MAPkginfoScanner.m b/MunkiAdmin/NSOperation Subclasses/MAPkginfoScanner.m
@@ -72,8 +72,8 @@ - (void)scan
 
 			MAMunkiRepositoryManager *repoManager = [MAMunkiRepositoryManager sharedManager];
             MACoreDataManager *coreDataManager = [MACoreDataManager sharedManager];
-            MAMunkiAdmin_AppDelegate *appDelegate = (MAMunkiAdmin_AppDelegate *)[NSApp delegate];
 
+            MAMunkiAdmin_AppDelegate *appDelegate = (MAMunkiAdmin_AppDelegate *)self.delegate;
             NSManagedObjectContext *privateContext = self.context;
 
 			NSEntityDescription *catalogEntityDescr = [NSEntityDescription entityForName:@"Catalog" inManagedObjectContext:privateContext];

diff --git a/MunkiAdmin/NSOperation Subclasses/MARelationshipScanner.m b/MunkiAdmin/NSOperation Subclasses/MARelationshipScanner.m
@@ -392,7 +392,7 @@ - (void)scanManifests
 
 - (void)scanPkginfos
 {
-    MAMunkiAdmin_AppDelegate *appDelegate = (MAMunkiAdmin_AppDelegate *)[NSApp delegate];
+    MAMunkiAdmin_AppDelegate *appDelegate = (MAMunkiAdmin_AppDelegate *)self.delegate;
     NSManagedObjectContext *privateContext = self.context;
 
     NSEntityDescription *catalogEntityDescr = [NSEntityDescription entityForName:@"Catalog" inManagedObjectContext:privateContext];
@@ -666,7 +666,7 @@ use a default icon (which is the icon for .pkg file type).
 
 - (void)main {
     self.context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
-    self.context.parentContext = [(MAMunkiAdmin_AppDelegate *)[NSApp delegate] managedObjectContext];
+    self.context.parentContext = [(MAMunkiAdmin_AppDelegate *)self.delegate managedObjectContext];
     self.context.undoManager = nil;
     [self.context performBlockAndWait:^{
         @try {

diff --git a/MunkiAdmin/Singletons/MAMunkiRepositoryManager.m b/MunkiAdmin/Singletons/MAMunkiRepositoryManager.m
@@ -770,6 +770,7 @@ - (BOOL)duplicateManifest:(ManifestMO *)manifest
              Scan the new item
              */
             MAManifestScanner *manifestScanner = [[MAManifestScanner alloc] initWithURL:newURL];
+            manifestScanner.delegate = [NSApp delegate];
             manifestScanner.performFullScan = YES;
             [manifestScanner start];
             succeeded = YES;
@@ -804,6 +805,7 @@ - (BOOL)duplicateManifest:(ManifestMO *)manifest toURL:(NSURL *)newURL
          Scan the new item
          */
         MAManifestScanner *manifestScanner = [[MAManifestScanner alloc] initWithURL:newURL];
+        manifestScanner.delegate = [NSApp delegate];
         manifestScanner.performFullScan = YES;
         [manifestScanner start];
         succeeded = YES;