jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable removing the plugin dll from the menu

Browse source 
Implements change from MR !2148 without refactoring
This commit is contained in:
Adam Honse 2023-12-26 16:46:45 -06:00
parent db50b1f568
commit 67fbdceb92
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PluginManager.cpp
View file

@ -107,8 +107,16 @@ void PluginManager::AddPlugin(const filesystem::path& path)
\*-----------------------------------------------------------------*/ \*-----------------------------------------------------------------*/
std::string path_string = path.generic_u8string(); std::string path_string = path.generic_u8string();
QPluginLoader* loader = new QPluginLoader(QString::fromStdString(path_string)); QPluginLoader* loader = new QPluginLoader(QString::fromStdString(path_string));
QObject* instance = loader->instance();
/*-----------------------------------------------------------------*\
| Change the loader Hint flag to able to delete the plugin |
| The default value is QLibrary::PreventUnloadHint |
\*-----------------------------------------------------------------*/
loader->setLoadHints(QLibrary::ExportExternalSymbolsHint);
/*-----------------------------------------------------------------*\
| Check if the plugin was loaded |
\*-----------------------------------------------------------------*/
if(!loader->isLoaded()) if(!loader->isLoaded())
{ {
LOG_WARNING("[PluginManager] Plugin %s cannot be loaded: %s", path.c_str(), loader->errorString().toStdString().c_str()); LOG_WARNING("[PluginManager] Plugin %s cannot be loaded: %s", path.c_str(), loader->errorString().toStdString().c_str());
@ -117,6 +125,8 @@ void PluginManager::AddPlugin(const filesystem::path& path)
/*-----------------------------------------------------------------*\ /*-----------------------------------------------------------------*\
| Check that the plugin is valid, then check the API version | | Check that the plugin is valid, then check the API version |
\*-----------------------------------------------------------------*/ \*-----------------------------------------------------------------*/
QObject* instance = loader->instance();
if(instance) if(instance)
{ {
plugin = qobject_cast<OpenRGBPluginInterface*>(instance); plugin = qobject_cast<OpenRGBPluginInterface*>(instance);