From f606925d4c26f3c458948a12bf95fd042966eed6 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 6 Apr 2006 19:54:02 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9805
---
 checkin_notes          |  7 ++++++
 clientgui/DlgAbout.cpp | 50 ++++++++++++++++++++----------------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index ee1b22efc3..4f3340c2fb 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3615,3 +3615,10 @@ Rom    6 Apr 2006 (From Frank S. Thomas)
         
     clientgui/
         MainDocument.cpp
+
+Rom    6 Apr 2006 (From Darrel Holz)
+    - Bug Fix: Fix the Logo display for BOINC when not running as a branded
+        client.
+        
+    clientgui/
+        DlgAbout.cpp
diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp
index 727d8fa6d7..e18bd9ee73 100644
--- a/clientgui/DlgAbout.cpp
+++ b/clientgui/DlgAbout.cpp
@@ -87,34 +87,32 @@ bool CDlgAbout::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
 
     // Change the various dialog items for the branded manager
     //
+    wxString buf = wxEmptyString;
+    buf.Printf(
+        _("About %s"),
+        wxGetApp().GetBrand()->GetApplicationName().c_str()
+    );
+    SetTitle(buf);
+
+    buf.Printf(
+        _("%s"),
+        wxGetApp().GetBrand()->GetApplicationName().c_str()
+    );
+    m_AboutBOINCTitleCtrl->SetLabel(buf);
+
+    wxBitmap bmp;
     if (wxGetApp().GetBrand()->IsBranded()) {
-        wxString buf = wxEmptyString;
-        buf.Printf(
-            _("About %s"),
-            wxGetApp().GetBrand()->GetApplicationName().c_str()
-        );
-        SetTitle(buf);
-
-        buf.Printf(
-            _("%s"),
-            wxGetApp().GetBrand()->GetApplicationName().c_str()
-        );
-        m_AboutBOINCTitleCtrl->SetLabel(buf);
-
-        wxBitmap bmp;
-        if (wxGetApp().GetBrand()->IsBranded()) {
-            bmp = wxBitmap(*(wxGetApp().GetBrand()->GetApplicationLogo()));
-        } else {
-            bmp = wxBitmap(boincsm_xpm);
-        }
-        m_AboutBOINCLogoCtrl->SetBitmap(bmp);
-
-        m_AboutBOINCSloganCtrl->SetLabel(wxEmptyString);
-
-        m_AboutBOINCURLCtrl->SetLabel(
-            wxGetApp().GetBrand()->GetCompanyWebsite().c_str()
-        );
+        bmp = wxBitmap(*(wxGetApp().GetBrand()->GetApplicationLogo()));
+    } else {
+        bmp = wxBitmap(boincsm_xpm);
     }
+    m_AboutBOINCLogoCtrl->SetBitmap(bmp);
+
+    m_AboutBOINCSloganCtrl->SetLabel(wxEmptyString);
+
+    m_AboutBOINCURLCtrl->SetLabel(
+        wxGetApp().GetBrand()->GetCompanyWebsite().c_str()
+    );
 
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);