summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-02-06 14:24:06 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2016-02-06 14:24:06 -0500
commit5516e3bdd23248366aacd1d3d8caa08f888ac8a3 (patch)
treec8329771f41fcb1be28d3ce4d4ba6514caaff1e2 /libs/surfaces
parentdf76996aaa1440db7887d70486e79bb4a0fed3a8 (diff)
mackie: better fix for
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/mackie/surface.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 98ad7981ee..e4559de794 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -391,13 +391,16 @@ Surface::setup_master ()
if (!_master_fader) {
Groups::iterator group_it;
+ Group* master_group;
group_it = groups.find("master");
if (group_it == groups.end()) {
- groups["master"] = new Group ("master");
+ groups["master"] = master_group = new Group ("master");
+ } else {
+ master_group = group_it->second;
}
- _master_fader = dynamic_cast<Fader*> (Fader::factory (*this, _mcp.device_info().strip_cnt(), "master", *group_it->second));
+ _master_fader = dynamic_cast<Fader*> (Fader::factory (*this, _mcp.device_info().strip_cnt(), "master", *master_group));
DeviceInfo device_info = _mcp.device_info();
GlobalButtonInfo master_button = device_info.get_global_button(Button::MasterFaderTouch);