manual fixups after rebase against master (GUI edition)

This commit is contained in:
Paul Davis 2020-12-06 16:33:50 -07:00
parent bed76798f3
commit 84d33f3ec3
2 changed files with 2 additions and 2 deletions

View file

@ -202,7 +202,7 @@ AutomationRegionView::add_automation_event (GdkEvent *, timepos_t const & w, dou
assert (mc); assert (mc);
y = mc->user_double (); y = mc->user_double ();
} else { } else {
y = c->list()->eval (when_d); y = c->list()->eval (when);
} }
} }

View file

@ -627,7 +627,7 @@ public:
void finished (GdkEvent *, bool); void finished (GdkEvent *, bool);
void aborted (bool); void aborted (bool);
void setup_pointer_sample_offset (); void setup_pointer_offset ();
bool allow_vertical_autoscroll () const { bool allow_vertical_autoscroll () const {
return false; return false;