More safepointer fixes

Author: timothyschoen

Source/Canvas.cpp

@@ -1590,8 +1590,6 @@ void Canvas::deselectAll(bool const broadcastChange)
         s->hideParameters();
 
     if (!broadcastChange) {
-        // Add back the listener, but make sure it's added back 'after' the last event on the message queue.
-        // Guard with a SafePointer: the canvas may be deleted (e.g. its tab closed) before this runs.
         MessageManager::callAsync([_this = SafePointer(this)] {
             if (_this)
                 _this->selectedComponents.addChangeListener(_this);
@@ -2563,8 +2561,6 @@ void Canvas::setSelected(Component* component, bool const shouldNowBeSelected, b
     }
 
     if (!broadcastChange) {
-        // Add back the listener, but make sure it's added back 'after' the last event on the message queue.
-        // Guard with a SafePointer: the canvas may be deleted (e.g. its tab closed) before this runs.
         MessageManager::callAsync([_this = SafePointer(this)] {
             if (_this)
                 _this->selectedComponents.addChangeListener(_this);

Source/Heavy/DaisyExporter.h

@@ -90,8 +90,9 @@ class DaisyExporter final : public ExporterBase {
                 exportingView->showState(result ? ExportingProgressView::BootloaderFlashFailure : ExportingProgressView::BootloaderFlashSuccess);
                 exportingView->stopMonitoring();
 
-                MessageManager::callAsync([this] {
-                    repaint();
+                MessageManager::callAsync([_this = SafePointer(this)] {
+                    if (_this)
+                        _this->repaint();
                 });
             });
         };

Source/Heavy/ExporterBase.h

@@ -287,8 +287,9 @@ struct ExporterBase : public Component
 
             exportingView->stopMonitoring();
 
-            MessageManager::callAsync([this] {
-                repaint();
+            MessageManager::callAsync([_this = SafePointer(this)] {
+                if (_this)
+                    _this->repaint();
             });
 
             FileSystemWatcher::removeGlobalIgnorePath(outPath);

Source/Heavy/ToolchainInstaller.h

@@ -196,11 +196,13 @@ class ToolchainInstaller final : public Component
         auto success = Decompress::extractTarXz((uint8_t const*)toolchainData.getData(), toolchainData.getSize(), toolchainDir.getParentDirectory(), expectedSize);
 
         if (!success || statusCode >= 400) {
-            MessageManager::callAsync([this] {
-                installButton.topText = "Try Again";
-                errorMessage = "Error: Could not extract downloaded package";
-                repaint();
-                stopTimer();
+            MessageManager::callAsync([_this = SafePointer(this)] {
+                if (!_this)
+                    return;
+                _this->installButton.topText = "Try Again";
+                _this->errorMessage = "Error: Could not extract downloaded package";
+                _this->repaint();
+                _this->stopTimer();
             });
             return;
         }
@@ -210,8 +212,9 @@ class ToolchainInstaller final : public Component
         File driverSpec = toolchainDir.getChildFile("etc").getChildFile("usb_driver").getChildFile("DFU_in_FS_Mode.inf");
 
         // Since we interact with ComponentPeer, better call it from the message thread
-        MessageManager::callAsync([this, usbDriverInstaller, driverSpec]() mutable {
-            OSUtils::runAsAdmin(usbDriverInstaller.getFullPathName().toStdString(), ("install --inf=" + driverSpec.getFullPathName()).toStdString(), editor->getPeer());
+        MessageManager::callAsync([_this = SafePointer(this), usbDriverInstaller, driverSpec]() mutable {
+            if (_this)
+                OSUtils::runAsAdmin(usbDriverInstaller.getFullPathName().toStdString(), ("install --inf=" + driverSpec.getFullPathName()).toStdString(), _this->editor->getPeer());
         });
 #endif
 
@@ -239,9 +242,11 @@ class ToolchainInstaller final : public Component
         installProgress = 0.0f;
         stopTimer();
 
-        MessageManager::callAsync([this] {
-            dialog->setBlockFromClosing(false);
-            toolchainInstalledCallback();
+        MessageManager::callAsync([_this = SafePointer(this)] {
+            if (!_this)
+                return;
+            _this->dialog->setBlockFromClosing(false);
+            _this->toolchainInstalledCallback();
         });
     }