Max/PDModdingCommunity_PD-Loader
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 5 Wiki Activity

launcher: fix plugins being loaded when not wanted

Browse Source
This commit is contained in:
somewhatlurker
2019-08-30 00:16:34 +10:00
parent bad2e02ce5
commit 2300077eae
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/plugins/Launcher/framework.h
+5 -4
View File
@@ -318,8 +318,7 @@ std::vector<PluginInfo> LoadPlugins()
if (optsFunc != NULL)
thisplugin.configopts = PluginConfig::GetConfigOptionVec(optsFunc());
// afaik FreeLibrary should be fine because of ref counting, but it isn't. whatever.
// FreeLibrary(thisplugin.handle);
FreeLibrary(thisplugin.handle);
outvec.push_back(thisplugin);
}
@@ -330,7 +329,8 @@ std::vector<PluginInfo> LoadPlugins()
return outvec;
}
std::vector<PluginInfo> AllPlugins = LoadPlugins();
// don't load until actually needed to avoid loading disabled plugins
std::vector<PluginInfo> AllPlugins; // = LoadPlugins();
std::vector<PluginOption*> GetPluginOptions(std::vector<PluginInfo>* plugins)
{
@@ -344,7 +344,8 @@ std::vector<PluginOption*> GetPluginOptions(std::vector<PluginInfo>* plugins)
return outvec;
}
std::vector<PluginOption*> AllPluginOpts = GetPluginOptions(&AllPlugins);
// don't load until actually needed to avoid loading disabled plugins
std::vector<PluginOption*> AllPluginOpts; // = GetPluginOptions(&AllPlugins);
// used to trick Optimus into switching to the NVIDIA GPU
source-code/source/plugins/Launcher/ui.h
+3
View File
@@ -120,6 +120,9 @@ namespace Launcher {
this->panel_Components->PerformLayout();
AllPlugins = LoadPlugins();
AllPluginOpts = GetPluginOptions(&AllPlugins);
this->panel_Plugins->SuspendLayout();
int pluginsY = 3;