commit dc720843fe1f689466d2ab98ffcf22ce88b7510a
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Thu Sep 10 16:44:02 2020 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Thu Sep 10 19:23:37 2020 -0400
tree 945d2173c95bc39d9075e4b56170f6e66fe4dc90
parent f1b4ede715791b7e2906189645a8bf2549a8ff7b

fix: memory leak

fix memory leaks related to
- image creation
- metal view

Change-Id: I2e5af4f06a7b22f671aa7dfecc4b4d68487d8599

src/SmartViewVC.mm

diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm
index 1d4caf1..aaf5a9b 100755
--- a/src/SmartViewVC.mm
+++ b/src/SmartViewVC.mm
@@ -496,24 +496,26 @@
         [displayRingID setStringValue:displayIDString];
         [displayRingID setHidden:NO];
     }
-    auto& imageManip = reinterpret_cast<Interfaces::ImageManipulationDelegate&>(GlobalInstances::pixmapManipulator());
-    NSImage* image = QtMac::toNSImage(qvariant_cast<QPixmap>(imageManip.conversationPhoto(conversation, convModel_->owner)));
-    if(image) {
-        [NSLayoutConstraint deactivateConstraints:[photoView constraints]];
-        NSArray* constraints = [NSLayoutConstraint
-                                constraintsWithVisualFormat:@"H:[photoView(54)]"
-                                options:0
-                                metrics:nil                                                                          views:NSDictionaryOfVariableBindings(photoView)];
-        [NSLayoutConstraint activateConstraints:constraints];
-    } else {
-        [NSLayoutConstraint deactivateConstraints:[photoView constraints]];
-        NSArray* constraints = [NSLayoutConstraint
-                                constraintsWithVisualFormat:@"H:[photoView(0)]"
-                                options:0
-                                metrics:nil                                                                          views:NSDictionaryOfVariableBindings(photoView)];
-        [NSLayoutConstraint activateConstraints:constraints];
+    @autoreleasepool {
+        auto& imageManip = reinterpret_cast<Interfaces::ImageManipulationDelegate&>(GlobalInstances::pixmapManipulator());
+        NSImage* image = QtMac::toNSImage(qvariant_cast<QPixmap>(imageManip.conversationPhoto(conversation, convModel_->owner)));
+        if(image) {
+            [NSLayoutConstraint deactivateConstraints:[photoView constraints]];
+            NSArray* constraints = [NSLayoutConstraint
+                                    constraintsWithVisualFormat:@"H:[photoView(54)]"
+                                    options:0
+                                    metrics:nil                                                                          views:NSDictionaryOfVariableBindings(photoView)];
+            [NSLayoutConstraint activateConstraints:constraints];
+        } else {
+            [NSLayoutConstraint deactivateConstraints:[photoView constraints]];
+            NSArray* constraints = [NSLayoutConstraint
+                                    constraintsWithVisualFormat:@"H:[photoView(0)]"
+                                    options:0
+                                    metrics:nil                                                                          views:NSDictionaryOfVariableBindings(photoView)];
+            [NSLayoutConstraint activateConstraints:constraints];
+        }
+        [photoView setImage: image];
     }
-    [photoView setImage: image];
 
     NSView* presenceView = [result viewWithTag:PRESENCE_TAG];
     [presenceView setHidden:YES];