Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up registry lock file after parse failure #2175

Merged
merged 2 commits into from
Nov 6, 2017
Merged

Clean up registry lock file after parse failure #2175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4da5339
Clean up registry lock file after parse failure
HebaruSan Nov 5, 2017
8c3332b
Conform to CKAN's curly brace positioning convention
HebaruSan Nov 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Core/Registry/RegistryManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,16 @@ private RegistryManager(string path, KSP ksp)
throw new RegistryInUseKraken(lockfilePath);
}

LoadOrCreate();
try
{
LoadOrCreate();
}
catch
{
// Clean up the lock file
Dispose(false);
throw;
}

// We don't cause an inconsistency error to stop the registry from being loaded,
// because then the user can't do anything to correct it. However we're
Expand Down