Fixes inconsistent .json suffix in .ini file causing crash. Updates version number to 0.0.4. Adds version number to config window.

Author: FiniteSingularity

CMakeLists.txt

@@ -34,7 +34,7 @@ function(setup_obs_lib_dependency target)
   endif()
 endfunction()
 
-project(elgato-marketplace VERSION 0.0.3)
+project(elgato-marketplace VERSION 0.0.4)
 
 if(${CMAKE_PROJECT_NAME} STREQUAL "obs-studio")
   set(OBS_FRONTEND_API_NAME "frontend-api")

buildspec.json

@@ -40,7 +40,7 @@
     },
     "name": "elgato-marketplace",
     "displayName": "Elgato Marketplace Plugin",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "author": "Elgato",
     "website": "https://elgato.com",
     "email": "support@elgato.com",

src/elgato-cloud-config.cpp

@@ -539,6 +539,11 @@ ElgatoCloudConfig::ElgatoCloudConfig(QWidget *parent) : QDialog(parent)
 
 	layout->addStretch();
 
+	std::string version = "v";
+	version += PLUGIN_VERSION;
+	auto versionLabel = new QLabel(version.c_str(), this);
+	layout->addWidget(versionLabel);
+
 	auto buttons = new QHBoxLayout();
 
 	QPushButton* cancelButton = new QPushButton(this);

src/elgato-cloud-window.cpp

@@ -805,15 +805,15 @@ void CloseElgatoCloudWindow()
 
 extern void InitElgatoCloud(obs_module_t *module)
 {
-	obs_log(LOG_INFO, "version: %s", "0.0.3-maker");
+	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);
 }
 
-extern obs_data_t* GetElgatoCloudConfig()
+extern obs_data_t *GetElgatoCloudConfig()
 {
 	if (elgatoCloud) {
 		return elgatoCloud->GetConfig();

src/plugin-support.c

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 extern void blogva(int log_level, const char *format, va_list args);
 
 const char *PLUGIN_NAME = "elgato-marketplace";
-const char *PLUGIN_VERSION = "0.0.3";
+const char *PLUGIN_VERSION = "0.0.4";
 
 void obs_log(int log_level, const char *format, ...)
 {

src/util.cpp

@@ -108,20 +108,26 @@ int get_major_version()
 	return -1;
 }
 
+bool filename_json(std::string& filename)
+{
+	const std::string suffix = ".json";
+	if (filename.size() < suffix.size()) {
+		return false;
+	}
+	return filename.compare(filename.size() - suffix.size(), suffix.size(), suffix) == 0;
+}
+
 std::string get_current_scene_collection_filename()
 {
 	int v = get_major_version();
+	std::string filename;
 	if (v < 31) { // Get the filename from global.ini
 		      // also in pre-31, the filename in the config file did not
 		      // have a filetype suffix.
 		      // so we need to add .json
 #pragma warning (disable : 4996)
-		std::string file_name =
-			config_get_string(obs_frontend_get_global_config(), "Basic", "SceneCollectionFile");
+		filename = config_get_string(obs_frontend_get_global_config(), "Basic", "SceneCollectionFile");
 #pragma warning (default : 4996)
-		file_name += ".json";
-		blog(LOG_INFO, "COLLECTION FILENAME: %s", file_name.c_str());
-		return file_name;
 	} else {  // get the filename from user.ini
 	        // in 31+ the filename stored in user.ini *does* have a filetype
 		// suffix.
@@ -130,12 +136,14 @@ std::string get_current_scene_collection_filename()
 		config_t* (*get_user_config)() = (config_t* (*)())sym;
 		config_t* user_config = get_user_config();
 		os_dlclose(obs_frontend_dll);
-		std::string file_name =
-			config_get_string(user_config, "Basic",
-				"SceneCollectionFile");
-		blog(LOG_INFO, "COLLECTION FILENAME: %s", file_name.c_str());
-		return file_name;
+		filename = config_get_string(user_config, "Basic", "SceneCollectionFile");
+	}
+	// OBS is inconsistent with adding .json to SceneCollectionFile value.
+	if (!filename_json(filename)) {
+		filename += ".json";
 	}
+	blog(LOG_INFO, "COLLECTION FILENAME: %s", filename.c_str());
+	return filename;
 }
 
 std::string fetch_string_from_get(std::string url, std::string token)

src/util.h

@@ -39,6 +39,7 @@ obs_data_t* get_module_config();
 void save_module_config(obs_data_t* config);
 
 int get_major_version();
+bool filename_json(std::string& filename);
 std::string get_current_scene_collection_filename();
 
 std::string fetch_string_from_get(std::string url, std::string token);