[GRASS-SVN] r49784 - grass/trunk/gui/wxpython/gmodeler

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-16 03:12:18 -0800 (Fri, 16 Dec 2011)
New Revision: 49784

Modified:
   grass/trunk/gui/wxpython/gmodeler/model.py
Log:
wxGUI/modeler: fix deletion of intermediate data
	       (merge r49783 from devbr6)


Modified: grass/trunk/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/model.py	2011-12-16 11:10:06 UTC (rev 49783)
+++ grass/trunk/gui/wxpython/gmodeler/model.py	2011-12-16 11:12:18 UTC (rev 49784)
@@ -526,6 +526,7 @@
         
         # parametrization
         params = self.Parameterize()
+        delInterData = False
         if params:
             dlg = ModelParamDialog(parent = parent,
                                    params = params)
@@ -537,6 +538,7 @@
                 return
             
             err = dlg.GetErrors()
+            delInterData = dlg.DeleteIntermediateData()
             dlg.Destroy()
             if err:
                 GError(parent = parent, message = unicode('\n'.join(err)))
@@ -619,7 +621,7 @@
                                        log = log, onDone = onDone)
                 params['variables']['params'].remove(varDict)
         
-        if dlg.DeleteIntermediateData():
+        if delInterData:
             self.DeleteIntermediateData(log)
         
         # discard values