Commit 632da782 authored by David Jarvie's avatar David Jarvie
Browse files

Merge commit '6af5386719f01cc3a71f9486807c66b1b3da26d1'

parents 1751e8bf b6f7c590
KAlarm Change Log
=== Version 2.11.4 --- 13 January 2016 ===
=== 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]
=== Version 2.11.3 (KDE Applications 15.08.3) --- 4 November 2015 ===
- Re-enable use of sendmail for email alarms.
......
/*
* editdlg.cpp - dialog to create or modify an alarm or alarm template
* Program: kalarm
* Copyright © 2001-2015 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
......@@ -496,6 +496,8 @@ void EditAlarmDlg::init(const KAEvent* event)
EditAlarmDlg::~EditAlarmDlg()
{
delete mButtonBox;
mButtonBox = Q_NULLPTR; // prevent text edit contentsChanged() signal triggering a crash
delete mSavedEvent;
mWindowList.removeAll(this);
}
......@@ -755,7 +757,7 @@ void EditAlarmDlg::contentsChanged()
{
// Don't do anything if it's a new alarm or we're still initialising
// (i.e. mSavedEvent null).
if (mSavedEvent && mButtonBox->button(QDialogButtonBox::Ok))
if (mSavedEvent && mButtonBox && mButtonBox->button(QDialogButtonBox::Ok))
mButtonBox->button(QDialogButtonBox::Ok)->setEnabled(stateChanged() || mDeferDateTime.kDateTime() != mSavedDeferTime);
}
......
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