From 2278cdce95b30c649624c6a244e7f518f789df4e Mon Sep 17 00:00:00 2001
From: "v.audacity" <v.audacity@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sun, 20 Nov 2011 07:09:46 +0000
Subject: [PATCH] Fix further possible, and comment on definite null pointer
 derefs per cppcheck.

---
 src/Theme.cpp      |  4 ++--
 src/TrackPanel.cpp | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Theme.cpp b/src/Theme.cpp
index 7b815ae97..e44154d70 100644
--- a/src/Theme.cpp
+++ b/src/Theme.cpp
@@ -1043,14 +1043,14 @@ wxCursor & ThemeBase::Cursor( int iIndex )
 {
    wxASSERT( iIndex >= 0 );
    EnsureInitialised();
-   return *(wxCursor*)NULL;
+   return *(wxCursor*)NULL; // ANSWER-ME: Purposeful null deref?
 }
 
 wxFont   & ThemeBase::Font( int iIndex )
 {
    wxASSERT( iIndex >= 0 );
    EnsureInitialised();
-   return *(wxFont*)NULL;
+   return *(wxFont*)NULL; // ANSWER-ME: Purposeful null deref?
 }
 
 /// Replaces both the image and the bitmap.
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index da0d9510f..b2aeb4847 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -5838,18 +5838,20 @@ void TrackPanel::UpdateVRuler(Track *t)
 void TrackPanel::UpdateTrackVRuler(Track *t)
 {
    wxASSERT(t);
+   if (!t)
+      return;
+
    wxRect r(GetVRulerOffset(),
             kTopInset,
             GetVRulerWidth(),
             t->GetHeight() - (kTopInset + 2));
 
-   if (t) {
-      mTrackArtist->UpdateVRuler(t, r);
-      Track *l = t->GetLink();
-      if (l) {
-         r.height = l->GetHeight() - (kTopInset + 2);
-         mTrackArtist->UpdateVRuler(l, r);
-      }
+   mTrackArtist->UpdateVRuler(t, r);
+   Track *l = t->GetLink();
+   if (l) 
+   {
+      r.height = l->GetHeight() - (kTopInset + 2);
+      mTrackArtist->UpdateVRuler(l, r);
    }
 }