ardour/livetrax
13
0
Fork 0
Code

Fix crash on startup caused by previous Mackie commits.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10137 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-09-26 23:18:59 +00:00
parent f349b4010d
commit daf5203f58
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -506,13 +506,14 @@ MackieControlProtocol::update_surface()
// _current_initial_bank is initialised by set_state
switch_banks (_current_initial_bank);
// create a RouteSignal for the master route
boost::shared_ptr<Route> mr = master_route ();
if (mr) {
master_route_signal = boost::shared_ptr<RouteSignal> (new RouteSignal (mr, *this, master_strip(), mcu_port()));
// update strip from route
master_route_signal->notify_all();
/* Create a RouteSignal for the master route, if we don't already have one */
if (!master_route_signal) {
boost::shared_ptr<Route> mr = master_route ();
if (mr) {
master_route_signal = boost::shared_ptr<RouteSignal> (new RouteSignal (mr, *this, master_strip(), mcu_port()));
// update strip from route
master_route_signal->notify_all();
}
}
// sometimes the jog wheel is a pot