IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use the right value to determine if the zone has a daylight time.

Browse Source 
It's not Daylight offset.
Also catch the now much less likely exception.
This commit is contained in:
John Ralls 2016-07-11 01:26:01 +00:00
parent 43a7cd096e
commit c11185e929
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libqof/qof/gnc-timezone.cpp
View File

@ -25,7 +25,7 @@
#include <string>
#include <cstdint>
#include <istream>
#include <iostream>
#include <algorithm>
#include <boost/date_time/gregorian/gregorian.hpp>
#if PLATFORM(WINDOWS)
@ -161,13 +161,25 @@ zone_from_regtzi (const RegTZI& regtzi, time_zone_names names)
auto std_week_num = make_week_num(regtzi.StandardDate.wDay);
auto dlt_week_num = make_week_num(regtzi.DaylightDate.wDay);
calc_rule_ptr dates;
if (regtzi.DaylightBias != 0)
if (regtzi.StandardDate.wMonth != 0)
{
ndate start (std_week_num, regtzi.StandardDate.wDayOfWeek,
regtzi.StandardDate.wMonth);
ndate end(dlt_week_num, regtzi.DaylightDate.wDayOfWeek,
regtzi.DaylightDate.wMonth);
dates.reset(new nth_day_rule (start, end));
try
{
ndate start (std_week_num, regtzi.StandardDate.wDayOfWeek,
regtzi.StandardDate.wMonth);
ndate end(dlt_week_num, regtzi.DaylightDate.wDayOfWeek,
regtzi.DaylightDate.wMonth);
dates.reset(new nth_day_rule (start, end));
}
catch (boost::gregorian::bad_month& err)
{
std::stringstream str;
str << "Caught Bad Month Exception. Daylight Bias: " <<
regtzi.DaylightBias << " Standard Month : " <<
regtzi.StandardDate.wMonth << " Daylight Month: " <<
regtzi.DaylightDate.wMonth << "\n";
PWARN(str.str().c_str());
}
}
return TZ_Ptr(new time_zone(names, std_off, offsets, dates));
}