[processing] fixes for issues with 3rd party providers being loaded and unloaded

volaya · volaya · commit 61e26fd8f365 · 2016-06-01T15:21:03.000+02:00
diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
@@ -112,9 +112,12 @@ def removeProvider(provider):
         """
         try:
             provider.unload()
-            Processing.providers.remove(provider)
-            algList.remove(provider.getName())
-            del Processing.actions[provider.getName()]
+            for p in Processing.providers:
+                if p.getName() == provider.getName():
+                    Processing.providers.remove(p)
+            algList.removeProvider(provider.getName())
+            if provider.getName() in Processing.actions:
+                del Processing.actions[provider.getName()]
             for act in provider.contextMenuActions:
                 Processing.contextMenuActions.remove(act)
         except:
@@ -131,7 +134,7 @@ def getProviderFromName(name):
 
     @staticmethod
     def initialize():
-        if Processing.providers:
+        if "model" in [p.getName() for p in Processing.providers]:
             return
         # Add the basic providers
         for c in AlgorithmProvider.__subclasses__():
diff --git a/python/plugins/processing/core/alglist.py b/python/plugins/processing/core/alglist.py
@@ -45,7 +45,8 @@ def removeProvider(self, providerName):
             if p.getName() == providerName:
                 self.providers.remove(p)
                 break
-        self.algs.remove(providerName)
+        if providerName in self.algs:
+            del self.algs[providerName]
         self.providerRemoved.emit(providerName)
 
     def reloadProvider(self, providerName):
