Skip to content
Permalink
Browse files

fix 5049 once more

  • Loading branch information...
alabuzhev committed Oct 2, 2017
1 parent 7ff40bd commit 9a880ce33bef46bc17a65426556ef39e6f9fb3f5
Showing with 10 additions and 4 deletions.
  1. +4 −0 far/changelog
  2. +5 −3 far/filelist.cpp
  3. +1 −1 far/vbuild.m4
@@ -1,3 +1,7 @@
drkns 02.10.2017 15:59:05 +0100 - build 5059

1. И ещё одно уточнение 5049.

drkns 02.10.2017 00:34:01 +0100 - build 5058

1. Уточнение 5057 (на самом деле нет, багу 4+ года).
@@ -725,12 +725,14 @@ class list_less
if (Ext2.empty())
Ext2 = GetExt(b);

const auto Name1 = PointToName(a.strName);
const auto Name2 = PointToName(b.strName);
const auto& GetNameOnly = [](const string_view& NameWithExt, const string_view& Ext)
{
return NameWithExt.substr(0, NameWithExt.size() - Ext.size());
};

const auto Comparer = get_comparer(ListNumericSort, ListCaseSensitiveSort);

int NameCmp = Comparer(Name1, Name2);
int NameCmp = Comparer(GetNameOnly(PointToName(a.strName), Ext1), GetNameOnly(PointToName(b.strName), Ext2));

if (!NameCmp)
{
@@ -1 +1 @@
m4_define(BUILD,5058)m4_dnl
m4_define(BUILD,5059)m4_dnl

0 comments on commit 9a880ce

Please sign in to comment.
You can’t perform that action at this time.