From a367068930221858dbbc3645cffc117b829c724e Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Sat, 11 Sep 2010 23:39:51 +0300
Subject: [PATCH] Pyfa exit - fixed ticket #42 - While by doing this I get rid
 of tracebacks, I don't like it, pyfa shutdowns in more than a second

---
 gui/shipBrowser.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index e910f32c8..f6a8e5877 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -90,10 +90,11 @@ class ShipBrowser(wx.Panel):
         self.shipView.SortChildren(self.shipRoot)
 
     def getActiveTree(self):
-        if self.searchView.IsShown():
-            return self.searchView
-        else:
-            return self.shipView
+        if self.searchView:
+            if self.searchView.IsShown():
+                return self.searchView
+            else:
+                return self.shipView
 
     def triggerFitSelect(self, event):
         selection = event.Item
@@ -109,6 +110,8 @@ class ShipBrowser(wx.Panel):
 
     def toggleButtons(self, event):
         tree = self.getActiveTree()
+        if tree is None:
+            return
         root = tree.GetSelection()
         btns = (self.shipMenu.new, self.shipMenu.rename, self.shipMenu.delete, self.shipMenu.copy)
         if not root.IsOk():