anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix thinko in loop detection

Browse Source
This commit is contained in:
Georg Baum 2014-06-09 22:06:58 +02:00
parent f792e70d0a
commit f76d6997b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/support/FileName.cpp
View File

@ -220,7 +220,6 @@ void FileName::erase()
bool FileName::copyTo(FileName const & name, bool keepsymlink) const bool FileName::copyTo(FileName const & name, bool keepsymlink) const
{ {
FileNameSet visited; FileNameSet visited;
visited.insert(*this);
return copyTo(name, keepsymlink, visited); return copyTo(name, keepsymlink, visited);
} }
@ -230,6 +229,7 @@ bool FileName::copyTo(FileName const & name, bool keepsymlink,
{ {
LYXERR(Debug::FILES, "Copying " << name << " keep symlink: " << keepsymlink); LYXERR(Debug::FILES, "Copying " << name << " keep symlink: " << keepsymlink);
if (keepsymlink && name.isSymLink()) { if (keepsymlink && name.isSymLink()) {
visited.insert(*this);
FileName const target(fromqstr(name.d->fi.symLinkTarget())); FileName const target(fromqstr(name.d->fi.symLinkTarget()));
if (visited.find(target) != visited.end()) { if (visited.find(target) != visited.end()) {
LYXERR(Debug::FILES, "Found circular symlink: " << target); LYXERR(Debug::FILES, "Found circular symlink: " << target);