From 6d53e23c76dc9093fea8958d0ae2328f9f5bcedd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 4 Jun 2021 19:22:12 -0400 Subject: Fix initialisation order --- src/Patchage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Patchage.cpp') diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 5adb524..2636066 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -167,7 +167,6 @@ port_order(const GanvPort* a, const GanvPort* b, void*) Patchage::Patchage(Options options) : _xml(UIFile::open("patchage")) - , _conf([this](const Setting& setting) { on_conf_change(setting); }) , INIT_WIDGET(_about_win) , INIT_WIDGET(_main_scrolledwin) , INIT_WIDGET(_main_win) @@ -203,10 +202,11 @@ Patchage::Patchage(Options options) , INIT_WIDGET(_main_paned) , INIT_WIDGET(_log_scrolledwindow) , INIT_WIDGET(_status_text) - , _legend(nullptr) + , _conf([this](const Setting& setting) { on_conf_change(setting); }) , _log(_status_text) - , _drivers(_log, [this](const Event& event) { on_driver_event(event); }) , _canvas(new Canvas{_log, _action_sink, 1600 * 2, 1200 * 2}) + , _legend(nullptr) + , _drivers(_log, [this](const Event& event) { on_driver_event(event); }) , _reactor(_conf, _drivers, *_canvas, _log) , _action_sink([this](const Action& action) { _reactor(action); }) , _options{options} -- cgit v1.2.1