From e47bb71b08e587b520d920ae065e09803daf0314 Mon Sep 17 00:00:00 2001 From: lllucius Date: Sun, 28 Dec 2014 21:06:58 +0000 Subject: [PATCH] Re-adds the ability to reset peaks while recording It also disables the "start/stop monitoring" menu item while recording. Not really necessary, but... --- src/widgets/Meter.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index 47dfd9af1..15e977f59 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -645,10 +645,12 @@ void Meter::OnMouse(wxMouseEvent &evt) wxMenu *menu = new wxMenu(); // Note: these should be kept in the same order as the enum if (mIsInput) { + wxMenuItem *mi; if (mMonitoring) - menu->Append(OnMonitorID, _("Stop Monitoring")); + mi = menu->Append(OnMonitorID, _("Stop Monitoring")); else - menu->Append(OnMonitorID, _("Start Monitoring")); + mi = menu->Append(OnMonitorID, _("Start Monitoring")); + mi->Enable(!mActive || mMonitoring); } menu->Append(OnPreferencesID, _("Preferences...")); @@ -662,7 +664,12 @@ void Meter::OnMouse(wxMouseEvent &evt) } else if (evt.LeftDown()) { if (mIsInput) { - StartMonitoring(); + if (mActive && !mMonitoring) { + Reset(mRate, true); + } + else { + StartMonitoring(); + } } else { Reset(mRate, true);