[processing] fixed add model from file

volaya · volaya · commit b6975d61214a · 2015-06-22T10:12:02.000+02:00
fixes #12902
diff --git a/python/plugins/processing/modeler/AddModelFromFileAction.py b/python/plugins/processing/modeler/AddModelFromFileAction.py
@@ -55,7 +55,7 @@ def execute(self):
         if filename:
             try:
                 settings.setValue('Processing/lastModelsDir',
-                    QFileInfo(fileName).absoluteDir().absolutePath())
+                    QFileInfo(filename).absoluteDir().absolutePath())
 
                 ModelerAlgorithm.fromFile(filename)
             except WrongModelException:
@@ -68,6 +68,7 @@ def execute(self):
                 QMessageBox.warning(self.toolbox,
                     self.tr('Error reading model', 'AddModelFromFileAction'),
                     self.tr('Cannot read file', 'AddModelFromFileAction'))
+                return
             destFilename = os.path.join(ModelerUtils.modelsFolder(), os.path.basename(filename))
             shutil.copyfile(filename,destFilename)
             self.toolbox.updateProvider('model')
