diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index a3c7dec31..b8d65ed36 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4231,10 +4231,10 @@ void OBSBasic::on_actionMoveToBottom_triggered() obs_sceneitem_set_order(item, OBS_ORDER_MOVE_BOTTOM); } -static BPtr ReadLogFile(const char *log) +static BPtr ReadLogFile(const char *subdir, const char *log) { char logDir[512]; - if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0) + if (GetConfigPath(logDir, sizeof(logDir), subdir) <= 0) return nullptr; string path = (char*)logDir; @@ -4248,9 +4248,9 @@ static BPtr ReadLogFile(const char *log) return file; } -void OBSBasic::UploadLog(const char *file) +void OBSBasic::UploadLog(const char *subdir, const char *file) { - BPtr fileString{ReadLogFile(file)}; + BPtr fileString{ReadLogFile(subdir, file)}; if (!fileString) return; @@ -4293,12 +4293,12 @@ void OBSBasic::on_actionShowLogs_triggered() void OBSBasic::on_actionUploadCurrentLog_triggered() { - UploadLog(App()->GetCurrentLog()); + UploadLog("obs-studio/logs", App()->GetCurrentLog()); } void OBSBasic::on_actionUploadLastLog_triggered() { - UploadLog(App()->GetLastLog()); + UploadLog("obs-studio/logs", App()->GetLastLog()); } void OBSBasic::on_actionViewCurrentLog_triggered() diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 5e7cadab8..7b814ec7a 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -199,7 +199,7 @@ private: void UpdateVolumeControlsDecayRate(); void ClearVolumeControls(); - void UploadLog(const char *file); + void UploadLog(const char *subdir, const char *file); void Save(const char *file); void Load(const char *file);