Merged with trunk R1141

[ardour.git] / libs / ardour / diskstream.cc

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index e9f8499981bd56612270f17318aa19f854bfda34..5f6f3956cfd5b5154720733c8c26ae829ed20b34 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -390,14 +390,14 @@ Diskstream::set_name (string str)
 }
 
 void
-Diskstream::set_destructive (bool yn)
+Diskstream::remove_region_from_last_capture (boost::weak_ptr<Region> wregion)
 {
-       if (yn != destructive()) {
-               reset_write_sources (true, true);
-               if (yn) {
-                       _flags |= Destructive;
-               } else {
-                       _flags &= ~Destructive;
-               }
+       boost::shared_ptr<Region> region (wregion.lock());
+
+       if (!region) {
+               return;
        }
+       
+       _last_capture_regions.remove (region);
 }
+