diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-26 16:18:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-26 16:18:03 +0000 |
| commit | 834f94c60a7f6ff2b0695096e9dbcd340dbca3af (patch) | |
| tree | dece708d97110d03dad26e5bab686f3c1b32f7ee /libs/surfaces/mackie/surface.cc | |
| parent | 3b7e2f7d67ad87bfb0ce183c10e9d00e71b6b085 (diff) | |
fix initialization of control protocols so that brand new sessions get working control protocols if the user's ardour.rc file indicates to do so; fix MCP bank scrolling
git-svn-id: svn://localhost/ardour2/branches/3.0@12096 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/surface.cc')
| -rw-r--r-- | libs/surfaces/mackie/surface.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index f27ac3893e..fecc4d5a33 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -606,9 +606,9 @@ void Surface::map_routes (const vector<boost::shared_ptr<Route> >& routes) { vector<boost::shared_ptr<Route> >::const_iterator r; - Strips::iterator s; + Strips::iterator s = strips.begin(); - for (r = routes.begin(), s = strips.begin(); r != routes.end() && s != strips.end(); ++s) { + for (r = routes.begin(); r != routes.end() && s != strips.end(); ++s) { /* don't try to assign routes to a locked strip. it won't use it anyway, but if we do, then we get out of sync |