Merge pull request #2539 from buinsky/master

Fix deleting folders on WinXP (fixes #2522)
This commit is contained in:
Audrius Butkevicius 2015-11-30 16:21:46 +00:00
commit 596c4b77e8
2 changed files with 2 additions and 0 deletions

View File

@ -71,4 +71,5 @@ Tully Robinson <tully@tojr.org>
Tyler Brazier <tyler@tylerbrazier.com> Tyler Brazier <tyler@tylerbrazier.com>
Veeti Paananen <veeti.paananen@rojekti.fi> Veeti Paananen <veeti.paananen@rojekti.fi>
Vil Brekin <vilbrekin@gmail.com> Vil Brekin <vilbrekin@gmail.com>
Victor Buinsky <vix.booja@tut.by>
Yannic A. <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com> Yannic A. <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>

View File

@ -716,6 +716,7 @@ func (p *rwFolder) deleteDir(file protocol.FileInfo) {
osutil.InWritableDir(osutil.Remove, filepath.Join(realName, file)) osutil.InWritableDir(osutil.Remove, filepath.Join(realName, file))
} }
} }
dir.Close()
} }
err = osutil.InWritableDir(osutil.Remove, realName) err = osutil.InWritableDir(osutil.Remove, realName)