Skip to content

Commit

Permalink
Merge #3464 Don't prompt to overwrite dirs
Browse files Browse the repository at this point in the history
  • Loading branch information
HebaruSan committed Oct 17, 2021
2 parents e406ad8 + 62a1dc8 commit efc0a85
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
- [Multiple] Default install stanza multi-game support, catch missing install_to (#3441 by: HebaruSan; reviewed: DasSkelett)
- [GUI] Escape ampersands in mod info abstract label (#3429 by: HebaruSan; reviewed: DasSkelett)
- [Core] Don't prompt user to choose conflicting modules (#3434 by: HebaruSan; reviewed: DasSkelett)
- [Core] Don't prompt to overwrite dirs (#3464 by: HebaruSan; reviewed: DasSkelett)

### Internal

Expand Down
3 changes: 2 additions & 1 deletion Core/ModuleInstaller.cs
Expand Up @@ -413,7 +413,8 @@ private IEnumerable<string> InstallModule(CkanModule module, string zip_filename
{
foreach (InstallableFile file in files)
{
if (File.Exists(file.destination)
if (!file.source.IsDirectory
&& File.Exists(file.destination)
&& registry.FileOwner(ksp.ToRelativeGameDir(file.destination)) == null)
{
log.DebugFormat("Comparing {0}", file.destination);
Expand Down

0 comments on commit efc0a85

Please sign in to comment.