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.

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

Don't sort again with inferior sort. #1060

Merged
merged 1 commit into from Aug 20, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+0 −8
Diff settings

Always

Just for now

Don't sort again with inferior sort.

Files were already sorted in ImageDirEngineImpl::LoadImageDir.
  • Loading branch information...
glachancecmaisonneuve committed Aug 20, 2018
commit 719a2ec35e0823c57b1cabbe21fac86e39730234
Copy path View file
@@ -872,13 +872,6 @@ bool CbxEngineImpl::LoadFromStream(IStream* stream) {
return FinishLoading();
}

static bool cmpArchFileInfoByName(Archive::FileInfo* f1, Archive::FileInfo* f2) {
const char* s1 = f1->name.data();
const char* s2 = f2->name.data();
int res = strcmp(s1, s2);
return res < 0;
}

bool CbxEngineImpl::FinishLoading() {
CrashIf(!cbxFile);
if (!cbxFile) {
@@ -914,7 +907,6 @@ bool CbxEngineImpl::FinishLoading() {
json::Parse(comment.data(), this);
}

std::sort(pageFiles.begin(), pageFiles.end(), cmpArchFileInfoByName);
size_t nFiles = pageFiles.size();
if (nFiles == 0) {
return false;
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.