OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 09:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix crash when starting vcam before other outputs

Browse source 
The BasicOutputHandler::Active() function was used for checking whether
outputs had started or not.  However, the virtual camera is not used in
the subclasses; instead it's a part of the base class.  Because of that
fact, when the virtual camera is started, the procedures used to start
up the other outputs are never called, causing outputs to crash because
they hadn't been initialized properly.  For example, starting the
virtual camera, then starting stream/recording would crash.

So, as a simple fix to this, when checking the active status in the
derived classes, do not factor in the virtual camera.
This commit is contained in:
jp9000 2020-09-03 05:19:08 -07:00
parent 1cdf16bac5
commit 218b936b1d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
UI/window-basic-main-outputs.cpp
View file

@ -725,7 +725,7 @@ const char *FindAudioEncoderFromCodec(const char *type)
bool SimpleOutput::StartStreaming(obs_service_t *service)
{
if (!Active())
if (!Active(false))
SetupOutputs();
Auth *auth = main->GetAuth();
@ -885,7 +885,7 @@ void SimpleOutput::UpdateRecording()
Update();
}
if (!Active())
if (!Active(false))
SetupOutputs();
if (!ffmpegOutput) {
@ -1507,7 +1507,7 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service)
UpdateAudioSettings();
if (!Active())
if (!Active(false))
SetupOutputs();
Auth *auth = main->GetAuth();
@ -1671,7 +1671,7 @@ bool AdvancedOutput::StartRecording()
UpdateAudioSettings();
if (!Active())
if (!Active(false))
SetupOutputs();
if (!ffmpegOutput || ffmpegRecording) {
@ -1740,7 +1740,7 @@ bool AdvancedOutput::StartReplayBuffer()
UpdateAudioSettings();
if (!Active())
if (!Active(false))
SetupOutputs();
if (!ffmpegOutput || ffmpegRecording) {

4
UI/window-basic-main-outputs.hpp
View file

@ -51,10 +51,10 @@ struct BasicOutputHandler {
virtual void Update() = 0;
inline bool Active() const
inline bool Active(bool check_vcam = true) const
{
return streamingActive || recordingActive || delayActive ||
replayBufferActive || virtualCamActive;
replayBufferActive || (check_vcam && virtualCamActive);
}
};