Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 22:23:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[46188] fix: get unix from datetime when empty dict

Browse Source 
(cherry picked from commit 1e820b3d9d)
This commit is contained in:
Aitor Cereceto 2021-03-12 08:12:43 +01:00 committed by Rémi Verschelde
parent 0def17e80a
commit 7e5020b2fa
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/bind/core_bind.cpp
View File

@ -798,6 +798,8 @@ Dictionary _OS::get_time(bool utc) const {
* @return epoch calculated * @return epoch calculated
*/ */
int64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { int64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const {
// if datetime is an empty Dictionary throws an error
ERR_FAIL_COND_V_MSG(datetime.empty(), 0, "Invalid datetime Dictionary: Dictionary is empty");
// Bunch of conversion constants // Bunch of conversion constants
static const unsigned int SECONDS_PER_MINUTE = 60; static const unsigned int SECONDS_PER_MINUTE = 60;

1
doc/classes/OS.xml
View File

@ -549,6 +549,7 @@
<description> <description>
Gets an epoch time value from a dictionary of time values. Gets an epoch time value from a dictionary of time values.
[code]datetime[/code] must be populated with the following keys: [code]year[/code], [code]month[/code], [code]day[/code], [code]hour[/code], [code]minute[/code], [code]second[/code]. [code]datetime[/code] must be populated with the following keys: [code]year[/code], [code]month[/code], [code]day[/code], [code]hour[/code], [code]minute[/code], [code]second[/code].
If the dictionary is empty [code]0[/code] is returned.
You can pass the output from [method get_datetime_from_unix_time] directly into this function. Daylight Savings Time ([code]dst[/code]), if present, is ignored. You can pass the output from [method get_datetime_from_unix_time] directly into this function. Daylight Savings Time ([code]dst[/code]), if present, is ignored.
</description> </description>
</method> </method>