Fixes some memory leaks, and potential crash-on-quit when AV settings are changed in the config window.

Author: FiniteSingularity

src/elgato-cloud-config.cpp

@@ -236,6 +236,10 @@ DefaultAVWidget::~DefaultAVWidget()
 			audioSigHandler, "update",
 			DefaultAVWidget::DefaultAudioUpdated, this);
 	}
+	if (_videoCaptureSource) {
+		obs_source_release(_videoCaptureSource);
+		obs_source_remove(_videoCaptureSource);
+	}
 	_levelsWidget = nullptr;
 }
 
@@ -294,6 +298,7 @@ void DefaultAVWidget::save()
 	else {
 		obs_data_set_string(config, "DefaultVideoCaptureSettings", "");
 	}
+	obs_data_release(settings);
 	obs_data_release(config);
 }
 

src/elgato-cloud-window.cpp

@@ -808,9 +808,14 @@ extern void InitElgatoCloud(obs_module_t *module)
 	obs_log(LOG_INFO, "version: %s", "0.0.4");
 
 	elgatoCloud = new ElgatoCloud(module);
-	//QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
-	//	"Elgato Marketplace");
-	//action->connect(action, &QAction::triggered, OpenElgatoCloudWindow);
+	QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
+		"Elgato Marketplace");
+	action->connect(action, &QAction::triggered, OpenElgatoCloudWindow);
+}
+
+extern void ShutDown()
+{
+	delete elgatoCloud;
 }
 
 extern obs_data_t *GetElgatoCloudConfig()

src/plugin-module.cpp

@@ -40,6 +40,7 @@ namespace elgatocloud {
 extern void InitElgatoCloud(obs_module_t *);
 extern obs_data_t* GetElgatoCloudConfig();
 extern void OpenExportWizard();
+extern void ShutDown();
 }
 
 void save_pack()
@@ -70,19 +71,20 @@ bool obs_module_load(void)
 	obs_log(LOG_INFO, "plugin loaded successfully (version %s)",
 		PLUGIN_VERSION);
 	elgatocloud::InitElgatoCloud(obs_current_module());
-	auto config = elgatocloud::GetElgatoCloudConfig();
-	bool makerTools = obs_data_get_bool(config, "MakerTools");
-	obs_data_release(config);
-	if (makerTools || true) {
-		obs_frontend_add_tools_menu_item("Export Marketplace Scene",
-			export_collection, NULL);
-		obs_frontend_add_tools_menu_item("Import Marketplace Scene",
-			import_collection, NULL);
-	}
+	//auto config = elgatocloud::GetElgatoCloudConfig();
+	//bool makerTools = obs_data_get_bool(config, "MakerTools");
+	//obs_data_release(config);
+	//if (makerTools) {
+	//	obs_frontend_add_tools_menu_item("Export Marketplace Scene",
+	//		export_collection, NULL);
+	//	obs_frontend_add_tools_menu_item("Import Marketplace Scene",
+	//		import_collection, NULL);
+	//}
 	return true;
 }
 
 void obs_module_unload(void)
 {
+	elgatocloud::ShutDown();
 	obs_log(LOG_INFO, "plugin unloaded");
 }