# HG changeset patch # User Chris Cannam # Date 1563194997 -3600 # Node ID 3943d0720167556c2b984b3500ff2cf1597a2da8 # Parent c1cae369979da1c01ad0052c9cead3ccf7a9afc8 Emit a signal when a cancel is pressed diff -r c1cae369979d -r 3943d0720167 view/View.cpp --- a/view/View.cpp Fri Jul 12 16:29:59 2019 +0100 +++ b/view/View.cpp Mon Jul 15 13:49:57 2019 +0100 @@ -1719,20 +1719,19 @@ QPushButton *cancel = qobject_cast(sender()); if (!cancel) return; + Layer *layer = nullptr; + for (ProgressMap::iterator i = m_progressBars.begin(); i != m_progressBars.end(); ++i) { - if (i->second.cancel == cancel) { - -/*!!! - Layer *layer = i->first; - Model *model = layer->getModel(); - - //!!! todo: restore this behaviour - if (model) model->abandon(); -*/ + layer = i->first; + break; } } + + if (layer) { + emit cancelButtonPressed(layer); + } } void diff -r c1cae369979d -r 3943d0720167 view/View.h --- a/view/View.h Fri Jul 12 16:29:59 2019 +0100 +++ b/view/View.h Mon Jul 15 13:49:57 2019 +0100 @@ -408,6 +408,8 @@ void layerModelChanged(); + void cancelButtonPressed(Layer *); + void centreFrameChanged(sv_frame_t frame, bool globalScroll, PlaybackFollowMode followMode);