From 6a42aa5f41c4fb8e078fe3eb7fb82c5355a0c898 Mon Sep 17 00:00:00 2001
From: "v.audacity" <v.audacity@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Mon, 5 Aug 2013 01:45:10 +0000
Subject: [PATCH] more changes per Campbell Barton's suggestions

---
 src/import/RawAudioGuess.cpp | 3 +++
 src/widgets/Meter.cpp        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp
index 0d89e5a51..8712d2615 100644
--- a/src/import/RawAudioGuess.cpp
+++ b/src/import/RawAudioGuess.cpp
@@ -950,6 +950,9 @@ static int Guess16Bit(int numTests, char **rawData,
 
    free(rawData2);
 
+   free(data1);
+   free(data2);
+
    return format;
 }
 
diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index 62235f373..f26bb4448 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -807,6 +807,7 @@ void Meter::HandleLayout()
       else
          mIconPos = wxPoint(mWidth - iconWidth - 1, 1);
       width = intmin(mWidth-(iconWidth+2), mWidth-(menuWidth+3));
+      // No break. Fall-through to MixerTrackCluster is intentional.
    case MixerTrackCluster:
       // Doesn't show menu, icon, or L/R labels,
       // but otherwise like VerticalStereo.