diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-07-09 15:46:17 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-07-09 15:46:17 +0000 |
| commit | d8fe4914897622dcf905adc75748c2b294ef3dbd (patch) | |
| tree | ac19d681c1a59f6b3c5827ac4f3998335260befd | |
| parent | a9ac0d4dab1522f674becff4189cac5b38684e60 (diff) | |
fix crasher caused by regions not being deleted on session unload; fix up srctar scons target for new sigc++
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3529 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/audioregion.cc | 9 | ||||
| -rw-r--r-- | libs/sigc++2/SConscript | 1 | ||||
| -rw-r--r-- | svn_revision.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index be7c1fbb0d..38950f3635 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -1481,6 +1481,15 @@ AudioRegion::speed_mismatch (float sr) const void AudioRegion::source_offset_changed () { + /* XXX this fixes a crash that should not occur. It does occur + becauses regions are not being deleted when a session + is unloaded. That bug must be fixed. + */ + + if (sources.empty()) { + return; + } + boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(sources.front()); if (afs && afs->destructive()) { diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript index 9ac1ef48ee..8d6bc93c24 100644 --- a/libs/sigc++2/SConscript +++ b/libs/sigc++2/SConscript @@ -25,6 +25,7 @@ env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ar env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog', 'configure', 'configure.ac', 'Makefile.am', 'SConscript', + 'config.sub', 'config.guess', 'sigc++/Makefile.in', 'sigc++config.h', 'sigc++config.h.in', diff --git a/svn_revision.h b/svn_revision.h index 8b87acb786..fbe21e310c 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 = "3343"; +static const char* ardour_svn_revision = "3527"; #endif |