Skip to content

Commit c887ec9

Browse files
Warchamp7RytoEX
authored andcommitted
frontend: Fix failed plugin popup in safe mode
loadState_ defaults to Failure was not being set after core success.
1 parent e7f0b0d commit c887ec9

1 file changed

Lines changed: 14 additions & 8 deletions

File tree

β€Žfrontend/plugin-manager/PluginManager.cppβ€Ž

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,20 @@ void PluginManager::loadAllPlugins(bool usePortableMode)
9191
loadState_ = State::Failure;
9292
//TODO: Replace with structured exception type - https://github.com/obsproject/obs-studio/issues/13394
9393
throw "Failed to load core OBS modules. OBS cannot run without these modules. Please try reinstalling OBS.";
94-
}
95-
96-
if (loadMode_ == Mode::Full) {
97-
blog(LOG_INFO, "---------------------------------");
98-
State pluginState = loadPlugins(usePortableMode);
99-
State legacyPluginState = loadLegacyPlugins(usePortableMode);
100-
101-
loadState_ = (pluginState && legacyPluginState) ? State::Success : State::PartialFailure;
94+
} else {
95+
if (loadMode_ == Mode::Full) {
96+
blog(LOG_INFO, "---------------------------------");
97+
State pluginState = loadPlugins(usePortableMode);
98+
State legacyPluginState = loadLegacyPlugins(usePortableMode);
99+
100+
if (pluginState && legacyPluginState) {
101+
loadState_ = State::Success;
102+
} else {
103+
loadState_ = State::PartialFailure;
104+
}
105+
} else {
106+
loadState_ = State::Success;
107+
}
102108
}
103109

104110
blog(LOG_INFO, "---------------------------------");

0 commit comments

Comments
Β (0)