[Expression] Don't unregister function if not registering

qgis · Nov 29, 2014 · 391d105 · 391d105
1 parent 7942325
commit 391d105
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/python/core/__init__.py b/python/core/__init__.py
@@ -47,7 +47,8 @@ def func(self, values, feature, parent):
     if arg_count == 0 and not name[0] == '$':
         name = '${0}'.format(name)
 
-    if QgsExpression.isFunctionName(name):
+    register = kwargs.get('register', True)
+    if register and QgsExpression.isFunctionName(name):
         if not QgsExpression.unregisterFunction(name):
             raise TypeError("Unable to unregister function")
 
@@ -57,7 +58,6 @@ def func(self, values, feature, parent):
 
     # This doesn't really make any sense here but does when used from a decorator context
     # so it can stay.
-    register = kwargs.get('register', True)
     if register:
         QgsExpression.registerFunction(f)
     return f