Fix subwindow logic safety, FX Mute stuck on UI lock, and Slot 1 Music not refreshing after unlock

Author: DEVCodeWithAI

Source/GUI/Components/FxSendsComponent.cpp

@@ -2,7 +2,7 @@
 #include "../../GUI/Layout/TrackComponent.h"
 #include "../../Components/Helpers.h"
 
-// ================== Component Tiêu Đề Tùy Chỉnh ==================
+// ... (FxSendsTitleComponent class is unchanged) ...
 class FxSendsTitleComponent : public juce::Component
 {
 public:
@@ -121,4 +121,20 @@ void FxSendsComponent::updateTexts()
     {
         updateMuteButtonState(i, fxMuteButtons[i].getToggleState());
     }
+}
+
+// <<< ADDED: Implementation of the new granular locking function >>>
+void FxSendsComponent::setLocked(bool shouldBeLocked)
+{
+    // Only disable the buttons that open FX windows
+    for (auto& button : fxButtons)
+    {
+        button.setEnabled(!shouldBeLocked);
+    }
+
+    // The mute buttons are NEVER locked
+    for (auto& muteButton : fxMuteButtons)
+    {
+        muteButton.setEnabled(true);
+    }
 }

Source/GUI/Components/FxSendsComponent.h

@@ -20,6 +20,9 @@ class FxSendsComponent : public juce::Component,
 
     void updateMuteButtonState(int index, bool isMuted);
 
+    // <<< ADDED: New method to handle granular locking >>>
+    void setLocked(bool shouldBeLocked);
+
 private:
     void changeListenerCallback(juce::ChangeBroadcaster* source) override;
     void updateTexts();

Source/GUI/Components/ProjectManagerComponent.cpp

@@ -49,10 +49,7 @@ ProjectManagerComponent::ProjectManagerComponent(AudioEngine& engine) : audioEng
 
 ProjectManagerComponent::~ProjectManagerComponent()
 {
-    if (projectListWindow != nullptr)
-    {
-        delete projectListWindow.getComponent();
-    }
+    // unique_ptr will handle deletion automatically.
     LanguageManager::getInstance().removeChangeListener(this);
     audioEngine.getProjectState().removeListener(this);
 }
@@ -197,15 +194,21 @@ void ProjectManagerComponent::stopProject()
     audioEngine.stopLoadedProject();
 }
 
+// <<< MODIFIED: Now uses unique_ptr and a callback for lifecycle management >>>
 void ProjectManagerComponent::manageProjects()
 {
     if (projectListWindow == nullptr)
     {
-        auto* window = new ProjectListWindow("Projects", audioEngine, [this](const juce::File& projectJsonFile) {
-            audioEngine.loadProject(projectJsonFile);
-            });
-        projectListWindow = window;
-        window->setVisible(true);
+        projectListWindow = std::make_unique<ProjectListWindow>(
+            "Projects",
+            audioEngine,
+            [this](const juce::File& projectJsonFile) {
+                audioEngine.loadProject(projectJsonFile);
+            },
+            [this] { // on close callback
+                projectListWindow.reset();
+            }
+        );
     }
     else
     {

Source/GUI/Components/ProjectManagerComponent.h

@@ -29,8 +29,8 @@ class ProjectManagerComponent : public juce::Component,
 
     AudioEngine& audioEngine;
 
-    // <<< SỬA: Thay thế WeakReference bằng Component::SafePointer >>>
-    juce::Component::SafePointer<ProjectListWindow> projectListWindow;
+    // <<< MODIFIED: Changed from SafePointer to unique_ptr for ownership >>>
+    std::unique_ptr<ProjectListWindow> projectListWindow;
 
     juce::Label loadedProjectTitleLabel;
     juce::Label loadedProjectLabel;

Source/GUI/Layout/MasterUtilityComponent.cpp

@@ -44,9 +44,20 @@ MasterUtilityComponent::MasterUtilityComponent(AudioEngine& engine)
         }
         };
 
-    quickKeySettingsButton.onClick = []
+    // <<< MODIFIED: This now safely manages the window's lifecycle >>>
+    quickKeySettingsButton.onClick = [this]
         {
-            // new QuickKeySettingsWindow(); // This creates a memory leak, will need fixing later
+            if (quickKeySettingsWindow == nullptr)
+            {
+                // Create the window with a callback that resets this unique_ptr
+                quickKeySettingsWindow = std::make_unique<QuickKeySettingsWindow>(
+                    [this] { quickKeySettingsWindow.reset(); }
+                );
+            }
+            else
+            {
+                quickKeySettingsWindow->toFront(true);
+            }
         };
 
     addAndMakeVisible(masterVolumeLabel);
@@ -201,6 +212,11 @@ void MasterUtilityComponent::closeAllPluginWindows()
     {
         masterPluginsWindow.reset();
     }
+    // <<< ADDED: Also close the QuickKeySettingsWindow on shutdown >>>
+    if (quickKeySettingsWindow != nullptr)
+    {
+        quickKeySettingsWindow.reset();
+    }
 }
 
 void MasterUtilityComponent::updateLockState()

Source/GUI/Layout/MasterUtilityComponent.h

@@ -12,6 +12,8 @@
 #include "../../GUI/Components/RecorderComponent.h"
 
 class MasterPluginsWindow;
+// <<< ADDED: Forward declaration for QuickKeySettingsWindow >>>
+class QuickKeySettingsWindow;
 
 class MasterUtilityComponent : public juce::Component,
     public juce::ChangeListener
@@ -47,6 +49,8 @@ class MasterUtilityComponent : public juce::Component,
     MasterProcessor* masterProcessor = nullptr;
 
     std::unique_ptr<MasterPluginsWindow> masterPluginsWindow;
+    // <<< ADDED: std::unique_ptr to own the settings window >>>
+    std::unique_ptr<QuickKeySettingsWindow> quickKeySettingsWindow;
 
     // <<< THÊM COMPONENT MỚI >>>
     std::unique_ptr<RecorderComponent> recorderComponent;

Source/GUI/Layout/TrackComponent.cpp

@@ -154,19 +154,29 @@ class TrackComponent::PluginItemComponent : public juce::Component,
 
     void setLocked(bool shouldBeLocked, bool isSpecialSlot)
     {
-        if (isSpecialSlot && shouldBeLocked)
+        if (!isSpecialSlot)
+        {
+            setEnabled(!shouldBeLocked);
+            return;
+        }
+
+        if (shouldBeLocked)
         {
             setEnabled(true);
             openButton.setEnabled(true);
-
             powerButton.setEnabled(false);
             removeButton.setEnabled(false);
             moveUpButton.setEnabled(false);
             moveDownButton.setEnabled(false);
         }
         else
         {
-            setEnabled(!shouldBeLocked);
+            setEnabled(true);
+            openButton.setEnabled(true);
+            powerButton.setEnabled(true);
+            removeButton.setEnabled(true);
+            moveUpButton.setEnabled(true);
+            moveDownButton.setEnabled(true);
         }
     }
 private:
@@ -909,8 +919,10 @@ void TrackComponent::updateLockState()
     volumeSlider.setEnabled(!isLocked);
     addPluginSelector.setEnabled(!isLocked);
     addButton.setEnabled(!isLocked);
-    fxSends->setEnabled(!isLocked);
-    muteButton.setEnabled(true);
+
+    fxSends->setLocked(isLocked);
+
+    muteButton.setEnabled(true); // Mute button is always enabled
 
     pluginListBox.setEnabled(true);
 

Source/GUI/Windows/FXChainWindow.cpp

@@ -422,7 +422,13 @@ FXChainWindow::FXChainWindow(const juce::String& name, ProcessorBase& processorT
 
 FXChainWindow::~FXChainWindow() { contentComponent.reset(); }
 
+// <<< MODIFIED: Safe self-deletion >>>
 void FXChainWindow::closeButtonPressed()
 {
-    delete this;
+    // This safely schedules the deletion of this window on the message thread,
+    // preventing crashes if the window is still being accessed.
+    juce::MessageManager::callAsync([safeThis = juce::Component::SafePointer(this)]() mutable {
+        if (safeThis)
+            delete safeThis.getComponent();
+        });
 }

Source/GUI/Windows/PluginEditorWindow.h

@@ -119,9 +119,13 @@ class PluginEditorWindow : public juce::DocumentWindow,
 
     juce::AudioPluginInstance& getOwnerPlugin() const { return ownerPlugin; }
 
+    // <<< MODIFIED: Safe self-deletion >>>
     void closeButtonPressed() override
     {
-        juce::MessageManager::callAsync([this] { delete this; });
+        juce::MessageManager::callAsync([safeThis = juce::Component::SafePointer(this)]() mutable {
+            if (safeThis)
+                delete safeThis.getComponent();
+            });
     }
 
     void audioProcessorParameterChanged(juce::AudioProcessor*, int, float) override {}

Source/GUI/Windows/ProjectListWindow.cpp

@@ -156,10 +156,12 @@ class ProjectListContentComponent : public juce::Component,
 // <<< SỬA: Cập nhật hàm khởi tạo của Window >>>
 ProjectListWindow::ProjectListWindow(const juce::String& recordingsSubDir,
     AudioEngine& engine,
-    std::function<void(const juce::File&)> onProjectChosen)
+    std::function<void(const juce::File&)> onProjectChosen,
+    std::function<void()> onWindowClosed)
     : DocumentWindow(LanguageManager::getInstance().get("projectListWindow.title"),
         juce::Desktop::getInstance().getDefaultLookAndFeel().findColour(juce::ResizableWindow::backgroundColourId),
-        allButtons)
+        allButtons),
+    onWindowClosedCallback(onWindowClosed)
 {
     setUsingNativeTitleBar(true);
     setResizable(true, true);
@@ -173,10 +175,12 @@ ProjectListWindow::ProjectListWindow(const juce::String& recordingsSubDir,
 ProjectListWindow::~ProjectListWindow()
 {
 }
+
+// <<< MODIFIED: Calls the callback, no longer deletes itself >>>
 void ProjectListWindow::closeButtonPressed()
 {
-    // Lệnh này sẽ tự động xóa cửa sổ khỏi bộ nhớ một cách an toàn.
-    delete this;
+    if (onWindowClosedCallback)
+        onWindowClosedCallback();
 }
 
 void ProjectListWindow::refreshList()