summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-04-25 18:42:54 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-04-25 18:42:54 +0000
commit98a3014966f490ef77a8f934bfb9c2c8e3b8ef5d (patch)
treeb3978a3bbee798bd56c1eb42d8c27cbfd8caab84
parenta76d015b8b13c382e1a57e2ac604317ada1dbdc2 (diff)
fix crash when opening session after one in which control surface(s) were used2.0rc2
git-svn-id: svn://localhost/ardour2/trunk@1745 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/control_protocol_manager.cc1
-rw-r--r--svn_revision.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index f7ae7f2b63..c79aa74698 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -97,6 +97,7 @@ ControlProtocolManager::drop_session ()
for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
// otherwise the ControlProtocol instances are not recreated in set_session
(*p)->requested = true;
+ (*p)->protocol = 0;
}
}
}
diff --git a/svn_revision.h b/svn_revision.h
index cac9bb0c97..d65b195c56 100644
--- a/svn_revision.h
+++ b/svn_revision.h
@@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "1681";
+static const char* ardour_svn_revision = "1744";
#endif