diff options
Diffstat (limited to 'libical/src/libical/icaltimezone.c')
| -rw-r--r-- | libical/src/libical/icaltimezone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libical/src/libical/icaltimezone.c b/libical/src/libical/icaltimezone.c index ca91d881da..3837888173 100644 --- a/libical/src/libical/icaltimezone.c +++ b/libical/src/libical/icaltimezone.c @@ -731,9 +731,9 @@ icaltimezone_convert_time (struct icaltimetype *tt, { int utc_offset, is_daylight; - /* If the time is a DATE value or both timezones are the same, we don't - need to do anything. */ - if (tt->is_date || from_zone == to_zone) + /* If the time is a DATE value or both timezones are the same, or we are + converting a floating time, we don't need to do anything. */ + if (tt->is_date || from_zone == to_zone || from_zone == NULL) return; /* Convert the time to UTC by getting the UTC offset and subtracting it. */ |