Skip to content

Commit

Permalink
fix check
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Chen <[email protected]>
  • Loading branch information
iche033 committed Jan 19, 2024
1 parent 674cd66 commit e297225
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions src/RenderEngineManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -381,21 +381,18 @@ RenderEngine *RenderEngineManagerPrivate::Engine(EngineInfo _info,
std::lock_guard<std::recursive_mutex> lock(this->enginesMutex);
// Check to see if we need to load the engine
auto engineIt = this->engines.find(libName);
bool loadEngine = engineIt == this->engines.end() ||
!engineIt->second;

// Load the engine plugin
if (loadEngine && this->LoadEnginePlugin(libName, _path))
// Engine is already loaded
if (engineIt != this->engines.end() && engineIt->second)
{
engine = engineIt->second;
}
// Load the engine
else if (this->LoadEnginePlugin(libName, _path))
{
engineIt = this->engines.find(libName);
if (engineIt != this->engines.end())
engine = engineIt->second;
}
else if (engineIt->second)
{
// Engine is already loaded
engine = engineIt->second;
}
}

if (!engine)
Expand Down

0 comments on commit e297225

Please sign in to comment.