diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-03-17 15:23:49 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-03-17 15:23:49 +0000 |
| commit | ddde67df581dea8c5a261e43d5b12a3821f06ed1 (patch) | |
| tree | e3c2859c54b0bba9c72ad221ea41c95ed8f5a70f /src/menu.cpp | |
| parent | 15ec7f61fa84a9a8b40c1c9fcfa6c2a268d3232b (diff) | |
| parent | 273c3b3829c9a3e853d0b6b0a32ae87cc3c6852b (diff) | |
| download | ayatana-indicator-datetime-ddde67df581dea8c5a261e43d5b12a3821f06ed1.tar.gz ayatana-indicator-datetime-ddde67df581dea8c5a261e43d5b12a3821f06ed1.tar.bz2 ayatana-indicator-datetime-ddde67df581dea8c5a261e43d5b12a3821f06ed1.zip | |
Fix bug that prevented clicking on calendar days where DST sprang forward. Fixes: #1429388
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'src/menu.cpp')
| -rw-r--r-- | src/menu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/menu.cpp b/src/menu.cpp index f11de77..ff894bc 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -152,9 +152,9 @@ protected: const auto now = m_state->clock->localtime(); const auto calendar_day = m_state->calendar_month->month().get(); if ((profile() == Desktop) && !DateTime::is_same_day(now, calendar_day)) - begin = calendar_day.add_full (0, 0, 0, -calendar_day.hour(), -calendar_day.minute(), -calendar_day.seconds()); + begin = calendar_day.start_of_day(); else - begin = now.add_full (0, 0, 0, 0, 0, -now.seconds()); + begin = now.start_of_minute(); std::vector<Appointment> upcoming; for(const auto& a : m_state->calendar_upcoming->appointments().get()) |