[GRASS-SVN] r52820 - in grass/branches/releasebranch_6_4/gui/wxpython: gui_core lmgr

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-08-21 08:06:16 -0700 (Tue, 21 Aug 2012)
New Revision: 52820

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py
   grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py
Log:
wxGUI: quick fix for #1565 (merge from trunk, r52818)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py	2012-08-21 14:58:59 UTC (rev 52819)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py	2012-08-21 15:06:16 UTC (rev 52820)
@@ -877,7 +877,10 @@
                     event.cmd[0] == 'r.mapcalc':
                 return
             
-            display = self.parent.GetLayerTree().GetMapDisplay()
+            tree = self.parent.GetLayerTree()
+            display = None
+            if tree:
+                display = tree.GetMapDisplay()
             if not display or not display.IsAutoRendered():
                 return
             mapLayers = map(lambda x: x.GetName(),

Modified: grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py	2012-08-21 14:58:59 UTC (rev 52819)
+++ grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py	2012-08-21 15:06:16 UTC (rev 52820)
@@ -499,7 +499,9 @@
 
     def GetLayerTree(self):
         """!Get current layer tree"""
-        return self.curr_page.maptree
+        if self.curr_page:
+            return self.curr_page.maptree
+        return None
     
     def GetLogWindow(self):
         """!Get widget for command output"""