From 5ddedeec73e3b05b2800d0176c1330eff9b9070c Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 16 Apr 2010 19:31:10 +0000
Subject: [PATCH] make sure that meters are configured to handle the right
 number of channels, and allow internal returns to be restored from XML in
 non-monitor busses

git-svn-id: svn://localhost/ardour2/branches/3.0@6917 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/meter.cc | 2 ++
 libs/ardour/route.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 0104de4bbd..98c46067c7 100644
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -115,6 +115,8 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
 
 	current_meters = in;
 
+        reset_max_channels (in);
+
 	return Processor::configure_io (in, out);
 }
 
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 9db0d18a91..cd48995f6a 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -2162,7 +2162,7 @@ Route::set_processor_state (const XMLNode& node)
                 } else if (prop->value() == "main-outs") {
                         _main_outs->set_state (**niter, Stateful::current_state_version);
                         new_order.push_back (_main_outs);
-                } else if (is_monitor() && prop->value() == "intreturn") {
+                } else if (prop->value() == "intreturn") {
                         if (!_intreturn) {
                                 _intreturn.reset (new InternalReturn (_session));
                                 must_configure = true;