From 0e19433788e86e1f9c4a51fbba38d9a806950b44 Mon Sep 17 00:00:00 2001
From: cncfanatics <diego.duclos@gmail.com>
Date: Fri, 27 Aug 2010 12:50:32 +0200
Subject: [PATCH] Fix a bug where ships without a race icon (like the
 apotheosis) would make stuff crash

---
 eos                | 2 +-
 gui/multiSwitch.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eos b/eos
index a5ba6e88b..193c9473b 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit a5ba6e88b6d71e855e40c9bf2a8a4fbeb16cb05c
+Subproject commit 193c9473b09f6400585ffbdc1e3d3bb4489ad501
diff --git a/gui/multiSwitch.py b/gui/multiSwitch.py
index 78e51df02..80afef895 100644
--- a/gui/multiSwitch.py
+++ b/gui/multiSwitch.py
@@ -98,8 +98,8 @@ class MultiSwitch(wx.Notebook):
                 fit = cFit.getFit(fitID)
                 self.SetPageText(tab, "%s: %s" % (fit.ship.item.name, fit.name))
                 bitmap = bitmapLoader.getBitmap("race_%s_small" % fit.ship.item.race, "icons")
-                imageId = self.imageList.Add(bitmap)
-                self.SetPageImage(tab, imageId)
+                if bitmap:
+                    self.SetPageImage(tab, self.imageList.Add(bitmap))
 
     def changeFit(self, event):
         selected = self.GetSelection()