diff --git a/deps/asio b/deps/asio index 08a7029c..b84e6c16 160000 --- a/deps/asio +++ b/deps/asio @@ -1 +1 @@ -Subproject commit 08a7029cb10c911b6fb66fb015217a431206e52c +Subproject commit b84e6c16b2ea907dbad94206b7510d85aafc0b42 diff --git a/src/requesthandler/RequestHandler.cpp b/src/requesthandler/RequestHandler.cpp index a0c118a4..340389fa 100644 --- a/src/requesthandler/RequestHandler.cpp +++ b/src/requesthandler/RequestHandler.cpp @@ -123,7 +123,7 @@ const std::map RequestHandler::_handlerMap {"ToggleRecordPause", &RequestHandler::ToggleRecordPause}, {"PauseRecord", &RequestHandler::PauseRecord}, {"ResumeRecord", &RequestHandler::ResumeRecord}, - //{"GetRecordDirectory", &RequestHandler::GetRecordDirectory}, + {"GetRecordDirectory", &RequestHandler::GetRecordDirectory}, // Media Inputs {"GetMediaInputStatus", &RequestHandler::GetMediaInputStatus}, diff --git a/src/utils/Obs_StringHelper.cpp b/src/utils/Obs_StringHelper.cpp index 471651ca..8b552abb 100644 --- a/src/utils/Obs_StringHelper.cpp +++ b/src/utils/Obs_StringHelper.cpp @@ -64,12 +64,10 @@ std::string Utils::Obs::StringHelper::GetCurrentProfilePath() std::string Utils::Obs::StringHelper::GetCurrentRecordOutputPath() { - //char *recordOutputPath = obs_frontend_get_current_record_output_path(); - //std::string ret = recordOutputPath; - //bfree(recordOutputPath); - //return ret; - - return ""; + char *recordOutputPath = obs_frontend_get_current_record_output_path(); + std::string ret = recordOutputPath; + bfree(recordOutputPath); + return ret; } std::string Utils::Obs::StringHelper::GetSourceType(obs_source_t *source)