Add a safeguard which will eliminate false disk underruns when punching

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

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 62f8fb9c36238af9bd2bac15535cf76fc32830dd..4744eb2d1781304e030e268bf5f92cb016e5a5a2 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -555,6 +555,12 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
        if (nominally_recording || (_session.get_record_enabled() && Config->get_punch_in())) {
                OverlapType ot;
                
+               // Safeguard against situations where process() goes haywire when autopunching and last_recordable_frame < first_recordable_frame
+               if (last_recordable_frame < first_recordable_frame) {
+                        last_recordable_frame = max_frames;
+
+               }
+               
                ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
 
                switch (ot) {