From d978d99fde9a8f799364f3479873d84f187f3b21 Mon Sep 17 00:00:00 2001
From: lllucius <lllucius@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Thu, 18 Dec 2014 08:00:18 +0000
Subject: [PATCH] Part 2 of fix from r13782 and monitoring fix

This fixes the monitoring fix Bill described here:

http://audacity.238276.n2.nabble.com/First-go-at-the-meter-toolbars-committed-tp7566196p7566209.html
---
 src/widgets/Meter.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index 681f68c33..1ade4d016 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -486,10 +486,13 @@ void Meter::SetStyle(Meter::Style newStyle)
    // MixerTrackCluster disallows style change.
    if (mStyle == MixerTrackCluster)
       return;
-   mStyle = newStyle;
-   gPrefs->Write(wxT("/Meter/MeterStyle"), newStyle == Meter::HorizontalStereo ? wxT("HorizontalStereo") : wxT("VerticalStereo"));
-   mLayoutValid = false;
-   Refresh(true);
+   if (mStyle != newStyle)
+   {
+      mStyle = newStyle;
+      gPrefs->Write(wxT("/Meter/MeterStyle"), newStyle == Meter::HorizontalStereo ? wxT("HorizontalStereo") : wxT("VerticalStereo"));
+      mLayoutValid = false;
+      Refresh(true);
+   }
 }
 
 void Meter::Reset(double sampleRate, bool resetClipping)
@@ -1447,7 +1450,7 @@ void Meter::StartMonitoring()
       }
    } 
 
-   if (start){
+   if (start && !gAudioIO->IsBusy()){
       if (mMeterDisabled){
          wxCommandEvent dummy;
          OnDisableMeter(dummy);