From 65b6c85594ecb98645de5048e7b496cc84c23659 Mon Sep 17 00:00:00 2001 From: reuk Date: Thu, 2 Nov 2023 13:57:03 +0000 Subject: [PATCH] ConcertinaPanel: Move call that was mistakenly added to move constructor --- .../juce_gui_basics/layout/juce_ConcertinaPanel.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp index d19270d9aa..9bb1c57491 100644 --- a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp +++ b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp @@ -285,16 +285,17 @@ private: CustomHeader() = default; CustomHeader (MouseListener* l, OptionalScopedPointer c) - : listener (l), customHeaderComponent (std::move (c)) {} - - CustomHeader (CustomHeader&& other) noexcept - : listener (std::exchange (other.listener, nullptr)), - customHeaderComponent (std::exchange (other.customHeaderComponent, {})) + : listener (l), + customHeaderComponent (std::move (c)) { if (customHeaderComponent != nullptr) customHeaderComponent->addMouseListener (listener, false); } + CustomHeader (CustomHeader&& other) noexcept + : listener (std::exchange (other.listener, nullptr)), + customHeaderComponent (std::exchange (other.customHeaderComponent, {})) {} + CustomHeader& operator= (CustomHeader&& other) noexcept { std::swap (other.listener, listener);