fix crash when copy'ing latent plugins

[ardour.git] / libs / canvas / wave_view.cc

diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc
index 5a975895a3899c0f96dc788901a18a47b1d937a2..17ee8609ff79dc641d084ea5bba29430f8a0514d 100644 (file)
--- a/libs/canvas/wave_view.cc
+++ b/libs/canvas/wave_view.cc
@@ -751,7 +751,7 @@ boost::shared_ptr<WaveViewCache::Entry>
 WaveView::cache_request_result (boost::shared_ptr<WaveViewThreadRequest> req) const
 {
        if (!req->image) {
-               cerr << "asked to cache null image!!!\n";
+               // cerr << "asked to cache null image!!!\n";
                return boost::shared_ptr<WaveViewCache::Entry> ();
        }
 
@@ -1005,7 +1005,7 @@ WaveView::generate_image (boost::shared_ptr<WaveViewThreadRequest> req, bool in_
                                                             req->samples_per_pixel);
 
                if (req->should_stop()) {
-                       cerr << "Request stopped after reading peaks\n";
+                       // cerr << "Request stopped after reading peaks\n";
                        return;
                }
 
@@ -1041,7 +1041,7 @@ WaveView::generate_image (boost::shared_ptr<WaveViewThreadRequest> req, bool in_
                        draw_absent_image (req->image, peaks.get(), n_peaks);
                }
        } else {
-               cerr << "Request stopped before image generation\n";
+               // cerr << "Request stopped before image generation\n";
        }
 
        if (in_render_thread && !req->should_stop()) {
@@ -1230,13 +1230,12 @@ WaveView::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) cons
                 * draw or the available width of the image.
                 */
 
-               draw_width = min ((double) image_to_draw->image->get_width() - (draw_start - image_to_draw->start),
-                                 (draw_end - draw_start));
+               draw_width = min ((double) image_to_draw->image->get_width(), (draw_end - draw_start));
 
 
-               DEBUG_TRACE (DEBUG::WaveView, string_compose ("%1 draw just %2 of %3 (iwidth %4 off %5 img @ %6 rs @ %7)\n", name, draw_width, (draw_end - draw_start),
+               DEBUG_TRACE (DEBUG::WaveView, string_compose ("%1 draw just %2 of %3 @ %8 (iwidth %4 off %5 img @ %6 rs @ %7)\n", name, draw_width, (draw_end - draw_start),
                                                              image_to_draw->image->get_width(), image_origin_in_self_coordinates,
-                                                             image_to_draw->start, _region_start));
+                                                             image_to_draw->start, _region_start, draw_start));
        } else {
                draw_width = draw_end - draw_start;
                DEBUG_TRACE (DEBUG::WaveView, string_compose ("use current image, span entire render width %1..%2\n", draw_start, draw_end));