diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2015-11-20 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:58 +0300 |
| commit | 5de23c1deb52b8be4c43ad9f694c64bbddd0c38a (patch) | |
| tree | 5b17a1cd7ecef0cba33bb3734356394136226940 /CPP/7zip/UI | |
| parent | e24f7fba53cc8f28d74b5039f7279d9bf945ff25 (diff) | |
15.1215.12
Diffstat (limited to 'CPP/7zip/UI')
| -rw-r--r-- | CPP/7zip/UI/Console/Console.mak | 1 | ||||
| -rw-r--r-- | CPP/7zip/UI/FileManager/PanelItems.cpp | 1 | ||||
| -rw-r--r-- | CPP/7zip/UI/GUI/HashGUI.cpp | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/CPP/7zip/UI/Console/Console.mak b/CPP/7zip/UI/Console/Console.mak index 29b6a854..05a07e5a 100644 --- a/CPP/7zip/UI/Console/Console.mak +++ b/CPP/7zip/UI/Console/Console.mak @@ -33,3 +33,4 @@ UI_COMMON_OBJS = \ $O\UpdatePair.obj \ $O\UpdateProduce.obj \ +# diff --git a/CPP/7zip/UI/FileManager/PanelItems.cpp b/CPP/7zip/UI/FileManager/PanelItems.cpp index e72d1bb6..8f73cffd 100644 --- a/CPP/7zip/UI/FileManager/PanelItems.cpp +++ b/CPP/7zip/UI/FileManager/PanelItems.cpp @@ -1097,6 +1097,7 @@ void CPanel::SaveListViewInfo() viewInfo.SortID = sortPropID; viewInfo.Ascending = _ascending; + viewInfo.IsLoaded = true; if (!_listViewInfo.IsEqual(viewInfo)) { viewInfo.Save(_typeIDString); diff --git a/CPP/7zip/UI/GUI/HashGUI.cpp b/CPP/7zip/UI/GUI/HashGUI.cpp index 68c2b768..03d65156 100644 --- a/CPP/7zip/UI/GUI/HashGUI.cpp +++ b/CPP/7zip/UI/GUI/HashGUI.cpp @@ -175,6 +175,7 @@ void AddHashBundleRes(UString &s, const CHashBundle &hb, const UString &firstFil AddValuePair(s, IDS_PROP_NUM_ERRORS, hb.NumErrors); s.Add_LF(); } + if (hb.NumFiles == 1 && hb.NumDirs == 0 && !firstFileName.IsEmpty()) { AddLangString(s, IDS_PROP_NAME); @@ -197,6 +198,12 @@ void AddHashBundleRes(UString &s, const CHashBundle &hb, const UString &firstFil AddSizeValuePair(s, IDS_PROP_ALT_STREAMS_SIZE, hb.AltStreamsSize); } + if (hb.NumErrors == 0 && hb.Hashers.IsEmpty()) + { + s.Add_LF(); + AddLangString(s, IDS_MESSAGE_NO_ERRORS); + } + FOR_VECTOR (i, hb.Hashers) { s.Add_LF(); |