Fixed cleanup order of static objects

Author: aleksandr-voitenko

obs-studio-server/source/nodeobs_api.cpp

@@ -1668,52 +1668,10 @@ void OBS_API::destroyOBS_API(void)
 		archiveEncoder = nullptr;
 	}
 
-	obs_output_t *streamingOutput;
-	streamingOutput = OBS_service::getStreamingOutput(StreamServiceId::Main);
-	if (streamingOutput != NULL) {
-		obs_output_release(streamingOutput);
-		streamingEncoder = nullptr;
-	}
-
-	streamingOutput = OBS_service::getStreamingOutput(StreamServiceId::Second);
-	if (streamingOutput != NULL) {
-		obs_output_release(streamingOutput);
-		streamingEncoder = nullptr;
-	}
-
-	obs_output_t *recordingOutput = OBS_service::getRecordingOutput();
-	if (recordingOutput != NULL) {
-		obs_output_release(recordingOutput);
-		recordingOutput = nullptr;
-	}
+	OBS_service::clearOutputObjectsForShutdown();
 
-	obs_output_t *replayBufferOutput = OBS_service::getReplayBufferOutput();
-	if (replayBufferOutput != NULL) {
-		obs_output_release(replayBufferOutput);
-		replayBufferOutput = nullptr;
-	}
-
-	obs_output *virtualWebcamOutput = OBS_service::getVirtualWebcamOutput();
-	if (virtualWebcamOutput != NULL) {
-		if (obs_output_active(virtualWebcamOutput))
-			obs_output_stop(virtualWebcamOutput);
-
-		obs_output_release(virtualWebcamOutput);
-		virtualWebcamOutput = nullptr;
-	}
-
-	obs_service_t *service;
-	service = OBS_service::getService(StreamServiceId::Main);
-	if (service != NULL) {
-		obs_service_release(service);
-		service = nullptr;
-	}
-
-	service = OBS_service::getService(StreamServiceId::Second);
-	if (service != NULL) {
-		obs_service_release(service);
-		service = nullptr;
-	}
+	OBS_service::setService(nullptr, StreamServiceId::Main);
+	OBS_service::setService(nullptr, StreamServiceId::Second);
 
 	OBS_service::clearRecordingAudioEncoder();
 	osn::Volmeter::ClearVolmeters();

obs-studio-server/source/nodeobs_service.cpp

@@ -2054,10 +2054,10 @@ void OBS_service::stopReplayBuffer(bool forceStop)
 
 obs_service_t *OBS_service::getService(StreamServiceId serviceId)
 {
-	if (serviceId <= services.size() && obs_service_get_type(services[serviceId]))
-		return services[serviceId];
-	else
+	if (serviceId >= services.size())
 		return nullptr;
+
+	return services[serviceId];
 }
 
 void OBS_service::setService(obs_service_t *newService, StreamServiceId serviceId)
@@ -2795,6 +2795,19 @@ void OBS_service::setVirtualWebcamOutput(obs_output_t *output)
 	virtualCam = output;
 }
 
+void OBS_service::clearOutputObjectsForShutdown(void)
+{
+	// These holders survive until CRT/static teardown. Clear the real owners before
+	// obs_shutdown() so later destructors do not release stale libobs pointers.
+	setStreamingOutput(nullptr, StreamServiceId::Main);
+	setStreamingOutput(nullptr, StreamServiceId::Second);
+	setRecordingOutput(nullptr);
+	setReplayBufferOutput(nullptr);
+	setVirtualWebcamOutput(nullptr);
+
+	enhancedBroadcastContext.reset();
+}
+
 void OBS_service::updateStreamingOutput(StreamServiceId serviceId)
 {
 	const char *currentOutputMode = config_get_string(ConfigManager::getInstance().getBasic(), "Output", "Mode");

obs-studio-server/source/nodeobs_service.h

@@ -196,6 +196,7 @@ class OBS_service {
 	static void setReplayBufferOutput(obs_output_t *output);
 	static obs_output_t *getVirtualWebcamOutput(void);
 	static void setVirtualWebcamOutput(obs_output_t *output);
+	static void clearOutputObjectsForShutdown(void);
 	static void waitReleaseWorker(void);
 
 	// Update settings