[FarGroup/FarManager] master: Minor fixes (f7899c54a)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Sep 30, 2025, 7:46:01 PM (yesterday) Sep 30
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/f7899c54a15b3424be06bdcefb601f835e1710ed

>---------------------------------------------------------------

commit f7899c54a15b3424be06bdcefb601f835e1710ed
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Wed Oct 1 00:35:59 2025 +0100

Minor fixes


>---------------------------------------------------------------

f7899c54a15b3424be06bdcefb601f835e1710ed
far/history.cpp | 4 +---
far/locale.cpp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/far/history.cpp b/far/history.cpp
index d2c33b838..3069f93a3 100644
--- a/far/history.cpp
+++ b/far/history.cpp
@@ -292,9 +292,7 @@ history_return_type History::ProcessMenu(string& strStr, UUID* const Uuid, strin
}
}

- os::chrono::local_time SavedTime;
- utc_to_local(i.Time, SavedTime);
- if(LastDay != SavedTime.Day || LastMonth != SavedTime.Month || LastYear != SavedTime.Year)
+ if (os::chrono::local_time SavedTime; utc_to_local(i.Time, SavedTime) && (LastDay != SavedTime.Day || LastMonth != SavedTime.Month || LastYear != SavedTime.Year))
{
LastDay = SavedTime.Day;
LastMonth = SavedTime.Month;
diff --git a/far/locale.cpp b/far/locale.cpp
index d34a6cb2f..595d3bef7 100644
--- a/far/locale.cpp
+++ b/far/locale.cpp
@@ -244,7 +244,7 @@ static auto get_month_day_names(int const Language)

if (!os::get_locale_value(CurLCID, Init.AbbrIndex, Dest.Short))
{
- Dest.Full = Init.Default.substr(0, 3);
+ Dest.Short = Init.Default.substr(0, 3);
LOGWARNING(L"get_locale_value(LOCALE_SABBREVMONTHNAME{}): {}"sv, Init.AbbrIndex, os::last_error());
}
}


Reply all
Reply to author
Forward
0 new messages