[GRASS-SVN] r56140 - grass/branches/develbranch_6/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-05-06 04:28:07 -0700 (Mon, 06 May 2013)
New Revision: 56140

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py
   grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py
Log:
wxGUI: sync fixes for #1949

Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py	2013-05-06 10:48:06 UTC (rev 56139)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py	2013-05-06 11:28:07 UTC (rev 56140)
@@ -592,7 +592,10 @@
         if self.parent.GetName() ==  'LayerTree':
             display = self.parent.GetMapDisplay()
         else: # Layer Manager
-            display = self.parent.GetLayerTree().GetMapDisplay()
+            display = None
+            tree = self.parent.GetLayerTree()
+            if tree:
+                display = tree.GetMapDisplay()
             
         if not display or not display.IsAutoRendered():
             return

Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py	2013-05-06 10:48:06 UTC (rev 56139)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py	2013-05-06 11:28:07 UTC (rev 56140)
@@ -941,7 +941,7 @@
                     mapTree = None
                 
                 cmd = dialog.notebookpanel.createCmd(ignoreErrors = True)
-                if hasattr(dialog, "addbox") and dialog.addbox.IsChecked():
+                if mapTree and hasattr(dialog, "addbox") and dialog.addbox.IsChecked():
                     # add created maps into layer tree
                     for p in dialog.task.get_options()['params']:
                         prompt = p.get('prompt', '')