Commit 88c19971 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/15.12'

parents 632da782 351df622
......@@ -3,6 +3,7 @@ KAlarm Change Log
=== Version 2.11.4 --- 22 January 2016 ===
- Fix reminder time edit being covered by 'in advance' combo [KDE Bug 357018]
- Fix crash after editing an alarm, if spell check is enabled [KDE Bug 356048]
- Fix occasional crash on startup [KDE Bug 358217]
=== Version 2.11.3 (KDE Applications 15.08.3) --- 4 November 2015 ===
- Re-enable use of sendmail for email alarms.
......
/*
* messagewin.cpp - displays an alarm message
* Program: kalarm
* Copyright © 2001-2014 by David Jarvie <djarvie@kde.org>
* Copyright © 2001-2016 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -1132,7 +1132,7 @@ void MessageWin::redisplayAlarms()
qCDebug(KALARM_LOG);
mRedisplayed = true;
AlarmCalendar* cal = AlarmCalendar::displayCalendar();
if (cal->isOpen())
if (cal && cal->isOpen())
{
KAEvent event;
Akonadi::Collection collection;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment