summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Jarvie <djarvie@kde.org>2012-06-06 21:40:17 (GMT)
committerDavid Jarvie <djarvie@kde.org>2012-06-06 21:41:38 (GMT)
commit054bedddbcc5de715948855830ad0ee4c09279b9 (patch)
tree3b894f007d0c56f184fde4507936a1ebd4603177
parent0c87e3ac8828ef91869eadf1fe0d3f15287911fb (diff)
Fix crash on closing alarm window of alarm with audio
Backport of 214833b11c1594f58c9bad6f7317b48a76fa98f7 (master)
-rw-r--r--kalarm/Changelog3
-rw-r--r--kalarm/messagewin.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/kalarm/Changelog b/kalarm/Changelog
index a275105..4363b17 100644
--- a/kalarm/Changelog
+++ b/kalarm/Changelog
@@ -1,7 +1,8 @@
KAlarm Change Log
-=== Version 2.8.5 --- 4 June 2012 ===
+=== Version 2.8.5 --- 6 June 2012 ===
- [Akonadi] Warn user and disable KAlarm if Akonadi fails to run.
+- Fix crash when closing alarm window for alarm which plays audio file.
=== Version 2.8.4 (KDE 4.8.4) --- 29 May 2012 ===
- [Akonadi] Fix crash when saving new alarm.
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 0d0263e..e359f39 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -1550,7 +1550,7 @@ void MessageWin::playFinished()
{
if (mSilenceButton)
mSilenceButton->setEnabled(false);
- if (!mAudioThread->error().isEmpty())
+ if (mAudioThread && !mAudioThread->error().isEmpty())
{
if (!haveErrorMessage(ErrMsg_AudioFile))
{