Global re-organization to split mobase from runner.

This commit is contained in:
Mikaël Capelle
2022-04-28 22:44:15 +02:00
parent b2767887a9
commit 68060b0e6b
44 changed files with 724 additions and 664 deletions
+8 -4
View File
@@ -134,18 +134,22 @@ bool ProxyPython::init(IOrganizer* moInfo)
if (m_MOInfo) {
m_MOInfo->setPersistent(name(), "tryInit", true);
m_Runner = std::unique_ptr<IPythonRunner>{createPythonRunner()};
}
if (!m_Runner->initialize(pluginFolder / "libs")) {
m_LoadFailure = FailureType::INITIALIZATION;
m_Runner = std::unique_ptr<IPythonRunner>{createPythonRunner()};
if (m_Runner) {
m_Runner->initialize(pluginFolder / "libs");
}
if (m_MOInfo) {
m_MOInfo->setPersistent(name(), "tryInit", false);
}
if (!m_Runner || !m_Runner->isInitialized()) {
m_LoadFailure = FailureType::INITIALIZATION;
}
// reset DLL directory
SetDllDirectoryW(NULL);