summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-01-29 12:41:10 +0000
committerCarl Hetherington <carl@carlh.net>2011-01-29 12:41:10 +0000
commit8dde7e7f5da1c0be359b60a631154de89060f707 (patch)
tree5078fc5c4482fa032bb7c43b467a676821a4ad7c
parenta052488c002f21839ca7babb855a481a86eba648 (diff)
Fix crash on unchecking show individual ports (#3740).
git-svn-id: svn://localhost/ardour2/branches/3.0@8607 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/port_matrix.cc4
-rw-r--r--gtk2_ardour/port_matrix_grid.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index e5e307d2cd..5b747d6693 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -958,8 +958,8 @@ PortMatrix::get_association (PortMatrixNode node) const
}
ARDOUR::BundleChannel c[2];
- c[column_index()] = ARDOUR::BundleChannel (node.row.bundle, i);
- c[row_index()] = ARDOUR::BundleChannel (node.column.bundle, j);
+ c[row_index()] = ARDOUR::BundleChannel (node.row.bundle, i);
+ c[column_index()] = ARDOUR::BundleChannel (node.column.bundle, j);
PortMatrixNode::State const s = get_state (c);
diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc
index a3da295c8b..96e9cb949c 100644
--- a/gtk2_ardour/port_matrix_grid.cc
+++ b/gtk2_ardour/port_matrix_grid.cc
@@ -144,8 +144,8 @@ PortMatrixGrid::render (cairo_t* cr)
for (PortGroup::BundleList::const_iterator j = row_bundles.begin(); j != row_bundles.end(); ++j) {
PortMatrixNode::State s = _matrix->get_association (PortMatrixNode (
- ARDOUR::BundleChannel ((*i)->bundle, 0),
- ARDOUR::BundleChannel ((*j)->bundle, 0)
+ ARDOUR::BundleChannel ((*j)->bundle, 0),
+ ARDOUR::BundleChannel ((*i)->bundle, 0)
));
switch (s) {
case PortMatrixNode::ASSOCIATED: