diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-08-03 12:51:45 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-08-03 12:51:45 +0000 |
| commit | 3f91181f8458cb6a6d95e25123db874875f7b259 (patch) | |
| tree | c36c0f0c5fab7aa60432e9e1d32ba5fdfabeb55e /zen/format_unit.cpp | |
| parent | Merge branch '11.22' into 'master' (diff) | |
| parent | add upstream 11.23 (diff) | |
| download | FreeFileSync-3f91181f8458cb6a6d95e25123db874875f7b259.tar.gz FreeFileSync-3f91181f8458cb6a6d95e25123db874875f7b259.tar.bz2 FreeFileSync-3f91181f8458cb6a6d95e25123db874875f7b259.zip | |
Merge branch 'b11.23' into 'master'11.23
add upstream 11.23
See merge request opensource-tracking/FreeFileSync!46
Diffstat (limited to 'zen/format_unit.cpp')
| -rw-r--r-- | zen/format_unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zen/format_unit.cpp b/zen/format_unit.cpp index 13280b68..2aa6e094 100644 --- a/zen/format_unit.cpp +++ b/zen/format_unit.cpp @@ -170,7 +170,7 @@ std::wstring zen::formatUtcToLocalTime(time_t utcTime) { auto errorMsg = [&] { return _("Error") + L" (time_t: " + numberTo<std::wstring>(utcTime) + L')'; }; - const TimeComp& loc = getLocalTime(utcTime); + const TimeComp& loc = getLocalTime(utcTime); //returns TimeComp() on error std::wstring dateString = utfTo<std::wstring>(formatTime(Zstr("%x %X"), loc)); return !dateString.empty() ? dateString : errorMsg(); |