From eab5fcc5c868f654193eb703b6064caeb4d4fa7b Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 25 Oct 2012 23:08:25 -0700
Subject: [PATCH] Fix assert in SkinManager when file referenced by
 <application_logo> tag is missing

---
 checkin_notes             | 5 ++++-
 clientgui/SkinManager.cpp | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 3dad5ca480..c5c55b2085 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6223,7 +6223,9 @@ Charlie 25 Oct 2012
     - Mac: Fix Quit command in Simple View and a crash bug with Quit AppleEvent.
     - Fix a bad FlexGridSizer in Simple Preferences dialog which caused assert.
     - Fix assert in Simple Preferences: use window foreground color for 
-        CTransparentStaticLine if skin does not specify <static_line_color>.
+        CTransparentStaticLine if skin does not specify <static_line_color> tag.
+    - Fix assert in SkinManager when file referenced by <application_logo> tag 
+        is missing.
 
     clientgui/
         BOINCGUIApp.cpp
@@ -6232,3 +6234,4 @@ Charlie 25 Oct 2012
             MacBitmapComboBox.cpp,.h
         sg_CustomControls.cpp,.h
         sg_DlgPreferences.cpp
+        SkinManager.cpp
diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp
index 59da0fca3b..8573b82adf 100644
--- a/clientgui/SkinManager.cpp
+++ b/clientgui/SkinManager.cpp
@@ -25,6 +25,7 @@
 #include "util.h"
 #include "error_numbers.h"
 #include "miofile.h"
+#include "filesys.h"
 #include "BOINCGUIApp.h"
 #include "BOINCBaseFrame.h"
 #include "SkinManager.h"
@@ -414,7 +415,9 @@ int CSkinAdvanced::Parse(MIOFILE& in) {
                     wxGetApp().GetSkinManager()->ConstructSkinPath() +
                     wxString(strBuffer.c_str(), wxConvUTF8)
                 );
-                m_bitmapApplicationLogo = wxBitmap(wxImage(str.c_str(), wxBITMAP_TYPE_ANY));
+                if (boinc_file_exists(str.c_str())) {
+                    m_bitmapApplicationLogo = wxBitmap(wxImage(str.c_str(), wxBITMAP_TYPE_ANY));
+                }
             }
             continue;
         } else if (parse_str(buf, "<organization_name>", strBuffer)) {