[GRASS-SVN] r56740 - grass/branches/releasebranch_6_4/gui/wxpython/lmgr

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Jun 16 19:43:40 PDT 2013


Author: hamish
Date: 2013-06-16 19:43:40 -0700 (Sun, 16 Jun 2013)
New Revision: 56740

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py
Log:
fix for modules which need an xterm/xmon and catch a traceback, #945(b), merge from devbr6

Modified: grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py	2013-06-17 02:38:57 UTC (rev 56739)
+++ grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py	2013-06-17 02:43:40 UTC (rev 56740)
@@ -39,7 +39,7 @@
 sys.path.append(os.path.join(globalvar.ETCDIR, "python"))
 from grass.script          import core as grass
 
-from core.gcmd             import RunCommand, GError, GMessage
+from core.gcmd             import Command, RunCommand, GError, GMessage
 from core.settings         import UserSettings
 from core.utils            import SetAddOnPath
 from gui_core.preferences  import MapsetAccess, PreferencesDialog, EVT_SETTINGS_CHANGED
@@ -1192,7 +1192,8 @@
         @param need_xmon True to start X monitor
         """
         # unset display mode
-        del os.environ['GRASS_RENDER_IMMEDIATE']
+        if os.getenv('GRASS_RENDER_IMMEDIATE'):
+            del os.environ['GRASS_RENDER_IMMEDIATE']
         
         if need_xmon:
             # open next available xmon



More information about the grass-commit mailing list