Parse json before sending data to events

obsproject · Sep 11, 2018 · 06a5c12 · 06a5c12
1 parent da0b449
commit 06a5c12
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/browser-app.cpp b/browser-app.cpp
@@ -131,16 +131,19 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
 
 		CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
 
-		Json::object json;
+		std::string err;
+		auto payloadJson = Json::parse(args->GetString(1).ToString(), err);
+
+		Json::object wrapperJson;
 		if (args->GetSize() > 1)
-			json["detail"] = args->GetString(1).ToString();
-		std::string jsonString = Json(json).dump();
+			wrapperJson["detail"] = payloadJson;
+		std::string wrapperJsonString = Json(wrapperJson).dump();
 		std::string script;
 
 		script += "new CustomEvent('";
 		script += args->GetString(0).ToString();
 		script += "', ";
-		script += jsonString;
+		script += wrapperJsonString;
 		script += ");";
 
 		CefRefPtr<CefV8Value> returnValue;