From ffffb7047cb0a3b6593fd4814826233b57da9001 Mon Sep 17 00:00:00 2001
From: Nick Hall <nick__hall@hotmail.com>
Date: Mon, 5 Apr 2010 16:14:26 +0000
Subject: [PATCH] get_active should return None if no history object exists

svn: r15037
---
 src/DisplayState.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DisplayState.py b/src/DisplayState.py
index 83406035c..bfcd11443 100644
--- a/src/DisplayState.py
+++ b/src/DisplayState.py
@@ -413,7 +413,7 @@ class DisplayState(gen.utils.Callback):
         navigation type and group.
         """
         history = self.get_history(nav_type, nav_group)
-        return history.present()
+        return history.present() if history else None
 
     def set_active(self, handle, nav_type, nav_group=0):
         """