Commit 0737cc3e authored by Michael Reeves's avatar Michael Reeves

Fix botched merge

BUG: 408991
parent 4ad69790
......@@ -774,6 +774,8 @@ bool DirectoryMergeWindow::DirectoryMergeWindowPrivate::fastFileComparison(
if(memcmp(&buf1[0], &buf2[0], len) != 0)
{
fi1.close();
fi2.close();
bError = false;
return bEqual;
}
......@@ -785,6 +787,9 @@ bool DirectoryMergeWindow::DirectoryMergeWindowPrivate::fastFileComparison(
// If the program really arrives here, then the files are really equal.
bError = false;
bEqual = true;
fi1.close();
fi2.close();
return bEqual;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment