Skip to content

Commit

Permalink
Merge branch 'master' into feature/rajas-of-asia-support
Browse files Browse the repository at this point in the history
  • Loading branch information
IhateTrains committed Jan 18, 2025
2 parents 39a2768 + 13412cb commit 9576957
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ log.txt
*.user
.vscode/settings.json

# I:R saves folder
# Imperator: Rome saves for testing
/Saves/
7 changes: 2 additions & 5 deletions ImperatorToCK3/Helpers/RakalyCaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,8 @@ public static void MeltSave(string savePath) {

if (stdErrText.Contains("Failed to create melted file")) {
// Try to copy the file to the converter's temp folder before melting.
var saveDisk = Path.GetPathRoot(savePath);
var converterDisk = Path.GetPathRoot(Directory.GetCurrentDirectory());

if (saveDisk != converterDisk) {
const string fallbackSavePath = "temp/save_to_be_melted.rome";
const string fallbackSavePath = "temp/save_to_be_melted.rome";
if (savePath != fallbackSavePath) {
File.Copy(savePath, fallbackSavePath, overwrite: true);
MeltSave(fallbackSavePath);
return;
Expand Down

0 comments on commit 9576957

Please sign in to comment.