Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 5d6e0d465d29e05888c704417e0d4554c98d3bc8..c545a02b464451fe1747be91f8ac818e2ddf9470 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -105,7 +105,6 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
 
        set_wmclass (X_("ardour_automationedit"), PROGRAM_NAME);
        set_name ("CrossfadeEditWindow");
-       set_position (Gtk::WIN_POS_MOUSE);
 
        add_accel_group (ActionManager::ui_manager->get_accel_group());
 
@@ -1172,9 +1171,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
                        waveview->set_outline_color (color);
                        waveview->set_fill_color (color);
 
-                       if (which == In) {
-                               waveview->set_region_start (region->start());
-                       } else {
+                       if (which != In) {
                                waveview->set_region_start (region->start() + region->length() - xfade->length());
                        }