From 96cddcb7110e154028023e6b735184c222a12b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 27 Jan 2010 00:22:48 +0000 Subject: [PATCH] * avoids crashing when fPlayList is already gone on quitting. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35307 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/mediaplayer/MainWin.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index a5a1af4524..d7fedd24b6 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -290,6 +290,7 @@ MainWin::~MainWin() fPlaylistWindow->Quit(); delete fPlaylist; + fPlaylist = NULL; // quit the Controller looper thread thread_id controllerThread = fController->Thread(); @@ -1057,6 +1058,8 @@ MainWin::GetQuitMessage(BMessage* message) playlistArchive.AddInt64("position", fController->TimePosition()); controllerLocker.Unlock(); + if (!fPlaylist) + return; BAutolock playlistLocker(fPlaylist); if (fPlaylist->Archive(&playlistArchive) != B_OK || playlistArchive.AddInt32("index",