Merge pull request from DorkNormalize/bob-rez-changes

Fix borked merge conflict resolution
This commit is contained in:
DorkNormalize 2025-04-06 18:09:06 -07:00 committed by GitHub
commit 3728de39ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -211,27 +211,6 @@ namespace AutoTrackR2
VideoRecordScript = "videorecord.ahk";
}
static ConfigManager()
{
LoadConfig();
// Set default values
// AppData\Local\AutoTrackR2\Kill-log.csv
KillHistoryFile = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
"AutoTrackR2",
"Kill-log.csv"
);
AHKScriptFolder = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
"AutoTrackR2"
);
VisorWipeScript = "visorwipe.ahk";
VideoRecordScript = "videorecord.ahk";
}
public static void LoadConfig()
{
// Define the config file path in a writable location