Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix 4963
  • Loading branch information
alabuzhev committed May 22, 2017
1 parent ba86c65 commit 2653f48
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions far/changelog
@@ -1,3 +1,7 @@
drkns 22.05.2017 23:20:20 +0000 - build 4966

1. Уточнение 4963.

drkns 22.05.2017 20:44:12 +0000 - build 4965

1. Ещё всякое на тему gcc 7.
Expand Down
3 changes: 2 additions & 1 deletion far/strmix.cpp
Expand Up @@ -602,7 +602,8 @@ string FileSizeToStr(unsigned long long FileSize, int WidthWithSign, unsigned lo
size_t UnitIndex = 0;
auto Str = ToStr(FileSize);

const auto SuffixSize = UseCompact? 1u : 2u;
const auto SuffixSize = (ShowUnit || (Width && Str.size() > Width))? UseCompact? 1u : 2u : 0u;

const auto MaxNumberWidth = Width > SuffixSize? Width - SuffixSize : 0;

while ((UseUnit && UnitIndex < MinUnit) || (Width && Str.size() > MaxNumberWidth))
Expand Down
2 changes: 1 addition & 1 deletion far/vbuild.m4
@@ -1 +1 @@
m4_define(BUILD,4965)m4_dnl
m4_define(BUILD,4966)m4_dnl

0 comments on commit 2653f48

Please sign in to comment.