Forráskód Böngészése

UI: Add subdir param to OBSBasic::UploadLog

Allows the ability to get log files from other configuration
subdirectories (i.e. "%appdata%/obs-studio/crashes")
jp9000 7 éve
szülő
commit
341bd9bcec
2 módosított fájl, 7 hozzáadás és 7 törlés
  1. 6 6
      UI/window-basic-main.cpp
  2. 1 1
      UI/window-basic-main.hpp

+ 6 - 6
UI/window-basic-main.cpp

@@ -4231,10 +4231,10 @@ void OBSBasic::on_actionMoveToBottom_triggered()
 	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_BOTTOM);
 	obs_sceneitem_set_order(item, OBS_ORDER_MOVE_BOTTOM);
 }
 }
 
 
-static BPtr<char> ReadLogFile(const char *log)
+static BPtr<char> ReadLogFile(const char *subdir, const char *log)
 {
 {
 	char logDir[512];
 	char logDir[512];
-	if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
+	if (GetConfigPath(logDir, sizeof(logDir), subdir) <= 0)
 		return nullptr;
 		return nullptr;
 
 
 	string path = (char*)logDir;
 	string path = (char*)logDir;
@@ -4248,9 +4248,9 @@ static BPtr<char> ReadLogFile(const char *log)
 	return file;
 	return file;
 }
 }
 
 
-void OBSBasic::UploadLog(const char *file)
+void OBSBasic::UploadLog(const char *subdir, const char *file)
 {
 {
-	BPtr<char> fileString{ReadLogFile(file)};
+	BPtr<char> fileString{ReadLogFile(subdir, file)};
 
 
 	if (!fileString)
 	if (!fileString)
 		return;
 		return;
@@ -4293,12 +4293,12 @@ void OBSBasic::on_actionShowLogs_triggered()
 
 
 void OBSBasic::on_actionUploadCurrentLog_triggered()
 void OBSBasic::on_actionUploadCurrentLog_triggered()
 {
 {
-	UploadLog(App()->GetCurrentLog());
+	UploadLog("obs-studio/logs", App()->GetCurrentLog());
 }
 }
 
 
 void OBSBasic::on_actionUploadLastLog_triggered()
 void OBSBasic::on_actionUploadLastLog_triggered()
 {
 {
-	UploadLog(App()->GetLastLog());
+	UploadLog("obs-studio/logs", App()->GetLastLog());
 }
 }
 
 
 void OBSBasic::on_actionViewCurrentLog_triggered()
 void OBSBasic::on_actionViewCurrentLog_triggered()

+ 1 - 1
UI/window-basic-main.hpp

@@ -199,7 +199,7 @@ private:
 	void          UpdateVolumeControlsDecayRate();
 	void          UpdateVolumeControlsDecayRate();
 	void          ClearVolumeControls();
 	void          ClearVolumeControls();
 
 
-	void          UploadLog(const char *file);
+	void          UploadLog(const char *subdir, const char *file);
 
 
 	void          Save(const char *file);
 	void          Save(const char *file);
 	void          Load(const char *file);
 	void          Load(const char *file);