Skip to content

frontend,libobs: Add Program Files plugin path and module dedup check #13203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marcusbooker77 wants to merge 1 commit into from
+29 −0
Closed

frontend,libobs: Add Program Files plugin path and module dedup check #13203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions frontend/widgets/OBSBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,24 @@ static void AddExtraModulePaths()
#endif
}

#if defined(_WIN32)
/* Search the standard OBS Studio installation directory so that
third-party plugins are available in development builds. */
{
char pf[512];
DWORD pf_len = GetEnvironmentVariableA("ProgramFiles", pf,
sizeof(pf));
if (pf_len > 0 && pf_len < sizeof(pf)) {
string std_bin =
string(pf) + "/obs-studio/obs-plugins/64bit";
string std_data = string(pf) +
"/obs-studio/data/obs-plugins/%module%";
obs_add_module_path(std_bin.c_str(),
std_data.c_str());
}
}
#endif

if (portable_mode)
return;

Expand Down Expand Up @@ -1407,6 +1425,8 @@ void OBSBasic::applicationShutdown() noexcept
patronJsonThread->wait();

delete screenshotData;
delete previewProjector;
delete studioProgramProjector;
delete previewProjectorSource;
delete previewProjectorMain;
delete sourceProjector;
Expand All @@ -1419,6 +1439,8 @@ void OBSBasic::applicationShutdown() noexcept
delete deinterlaceMenu;
delete perSceneTransitionMenu;
delete shortcutFilter;
delete trayIcon;
delete trayMenu;
delete programOptions;
delete program;

Expand Down
7 changes: 7 additions & 0 deletions libobs/obs-module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,13 @@ static void load_all_callback(void *param, const struct obs_module_info2 *info)
return;
}

/* Skip modules already loaded from a higher-priority path. */
if (obs_get_module(info->name)) {
blog(LOG_DEBUG, "Skipping module '%s' (%s), already loaded",
info->name, info->bin_path);
return;
}

int code = obs_open_module(&module, info->bin_path, info->data_path);
switch (code) {
case MODULE_MISSING_EXPORTS:
Expand Down
Loading