Defer Canon SDK calls until later in application launch

v002 · Aug 15, 2017 · 09acf9b · 09acf9b
1 parent 848d7b1
commit 09acf9b
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/Camera Live/SyPCanonDSLR.m b/Camera Live/SyPCanonDSLR.m
@@ -136,14 +136,24 @@ @implementation SyPCanonDSLR
 
 + (void)load
 {
-    EdsInitializeSDK();
-    EdsSetCameraAddedHandler(SyPCanonDSLRHandleCameraAdded, NULL);
-    SyPCanonDSLRHandleCameraAdded(NULL);
-}
-
-__attribute__((destructor)) static void finalizer()
-{
-	EdsTerminateSDK();
+    [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidFinishLaunchingNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * _Nonnull note) {
+        EdsInitializeSDK();
+        EdsSetCameraAddedHandler(SyPCanonDSLRHandleCameraAdded, NULL);
+        SyPCanonDSLRHandleCameraAdded(NULL);
+    }];
+    [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillTerminateNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * _Nonnull note) {
+        NSMutableSet *remove = [NSMutableSet setWithCapacity:1];
+        for (SyPCamera *camera in [SyPCamera cameras]) {
+            if ([camera isKindOfClass:[SyPCanonDSLR class]])
+            {
+                [remove addObject:camera];
+            }
+        }
+        for (SyPCamera *camera in remove) {
+            [SyPCamera removeCamera:camera];
+        }
+        EdsTerminateSDK();
+    }];
 }
 
 + (NSError *)errorForEDSError:(EdsError)code