Maker preview version for 0.0.4

Author: FiniteSingularity

loader/main.cpp

@@ -21,7 +21,7 @@ int main(int argc, char *argv[]) {
 
 	#define BUFFER_SIZE 8000
 	DWORD buffer_size = BUFFER_SIZE;
-	//wchar_t buffer[BUFFER_SIZE];
+	wchar_t buffer[BUFFER_SIZE];
 
 	std::wstring config_path;
 	std::wstring launch_path;
@@ -35,7 +35,6 @@ int main(int argc, char *argv[]) {
 	}*/
 
 	buffer_size = BUFFER_SIZE;
-	/*
 	auto status = RegGetValueW(HKEY_CURRENT_USER, L"SOFTWARE\\elgato\\obs", L"",
 			      RRF_RT_REG_SZ, nullptr, buffer, &buffer_size);
 	// Ignore if the value is too long for our buffer. The user can suffer if OBS is installed in a path longer than 8000 characters long
@@ -78,7 +77,7 @@ int main(int argc, char *argv[]) {
 
 		connect_attempts_remaining = 6;
 	}
-	*/
+
 
 	std::string payload = argv[1];
 
@@ -87,7 +86,7 @@ int main(int argc, char *argv[]) {
 	std::string base_name = "\\\\.\\pipe\\" + pipe_name;
 	std::string attempt_name;
 	HANDLE pipe = INVALID_HANDLE_VALUE;
-	int connect_attempts_remaining = 6;
+
 	while (connect_attempts_remaining-- > 0 &&
 	       pipe == INVALID_HANDLE_VALUE) {
 		pipe_number = 0;
@@ -108,15 +107,13 @@ int main(int argc, char *argv[]) {
 	}
 	if (pipe == INVALID_HANDLE_VALUE) {
 		printf("Could not open named pipe!");
-		while (true) Sleep(100);
 		return 1;
 	}
 	DWORD mode = PIPE_READMODE_MESSAGE;
 	auto success = SetNamedPipeHandleState(pipe, &mode, NULL, NULL);
 	if (!success) {
 		CloseHandle(pipe);
 		printf("Could not configure named pipe!");
-		while (true) Sleep(100);
 		return 1;
 	}
 
@@ -126,10 +123,9 @@ int main(int argc, char *argv[]) {
 	if (!success || written < payload.size()) {
 		printf("Failed to write to named pipe!");
 		CloseHandle(pipe);
-		while (true) Sleep(100);
 		return 1;
 	}
+
 	CloseHandle(pipe);
-	while (true) Sleep(100);
 	return 0;
 }

src/elgato-cloud-window.cpp

@@ -808,9 +808,9 @@ 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 obs_data_t *GetElgatoCloudConfig()

src/platform.cpp

@@ -200,7 +200,7 @@ bool listen_on_pipe(const std::string &pipe_name,
 		}
 
 		Sleep(100);
-		obs_log(LOG_INFO, "Connecting...");
+		obs_log(LOG_INFO, "Connecting... to %s", attempt_name.c_str());
 		bool connected = ConnectNamedPipe(pipe, NULL);
 		if (!connected && GetLastError() == ERROR_PIPE_CONNECTED) {
 			connected = true;
@@ -209,7 +209,7 @@ bool listen_on_pipe(const std::string &pipe_name,
 		std::string buffer;
 
 		if (connected) {
-			obs_log(LOG_INFO, "Connected");
+			obs_log(LOG_INFO, "Connected to %s", attempt_name.c_str());
 			while (true) {
 				buffer.resize(2048);
 				DWORD read_count = 0;
@@ -327,4 +327,4 @@ std::string move_file_safe(const std::string &from, const std::string &to)
 	} while (!move_file(from, newDst));
 
 	return newDst;
-}
+}

src/plugin-module.cpp

@@ -73,7 +73,7 @@ bool obs_module_load(void)
 	auto config = elgatocloud::GetElgatoCloudConfig();
 	bool makerTools = obs_data_get_bool(config, "MakerTools");
 	obs_data_release(config);
-	if (makerTools) {
+	if (makerTools || true) {
 		obs_frontend_add_tools_menu_item("Export Marketplace Scene",
 			export_collection, NULL);
 		obs_frontend_add_tools_menu_item("Import Marketplace Scene",