Explorar o código

Merge branch 'factory-expose-utility-functions'

* factory-expose-utility-functions:
  Don't unload plugin when uninstantiating a module
Julien Finet %!s(int64=13) %!d(string=hai) anos
pai
achega
04f618fbe8
Modificáronse 1 ficheiros con 2 adicións e 6 borrados
  1. 2 6
      Libs/Core/ctkAbstractPluginFactory.tpp

+ 2 - 6
Libs/Core/ctkAbstractPluginFactory.tpp

@@ -64,12 +64,8 @@ void ctkFactoryPluginItem<BaseClassType>::uninstantiate()
     {
     return;
     }
-  // QPluginLoader::unload doc says: "don't try to delete the root component".
-  bool deleted = this->Loader.unload();
-  if (deleted)
-    {
-    this->Instance = 0;
-    }
+  this->Instance->deleteLater();
+  this->Instance = 0;
 }
 
 //----------------------------------------------------------------------------