diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-06-12 22:55:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-12 22:55:25 +0200 |
commit | ac73059b56b35e20258774755f9742d032f51f52 (patch) | |
tree | 957b4562f711730561f67b204cffc3b0ae2b72b7 /platform/linuxbsd/os_linuxbsd.cpp | |
parent | edee79862894538ba29f0d2d4e90bdc970ba9e1c (diff) | |
parent | f64fea1b23df163485720c03054b3a17ae0c673a (diff) |
Merge pull request #49123 from aaronfranke/it-is-time
Add a Time singleton
Diffstat (limited to 'platform/linuxbsd/os_linuxbsd.cpp')
-rw-r--r-- | platform/linuxbsd/os_linuxbsd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index adae059552..c6a2fa5be7 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -425,8 +425,8 @@ Error OS_LinuxBSD::move_to_trash(const String &p_path) { // Generates the .trashinfo file OS::Date date = OS::get_singleton()->get_date(false); OS::Time time = OS::get_singleton()->get_time(false); - String timestamp = vformat("%04d-%02d-%02dT%02d:%02d:", date.year, date.month, date.day, time.hour, time.min); - timestamp = vformat("%s%02d", timestamp, time.sec); // vformat only supports up to 6 arguments. + String timestamp = vformat("%04d-%02d-%02dT%02d:%02d:", date.year, date.month, date.day, time.hour, time.minute); + timestamp = vformat("%s%02d", timestamp, time.second); // vformat only supports up to 6 arguments. String trash_info = "[Trash Info]\nPath=" + p_path.uri_encode() + "\nDeletionDate=" + timestamp + "\n"; { Error err; |