diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index 036c276..c17fdb5 100644
a
|
b
|
bool TV::eventFilter(QObject *o, QEvent *e) |
3477 | 3477 | /// This handles all standard events |
3478 | 3478 | bool TV::event(QEvent *e) |
3479 | 3479 | { |
| 3480 | if (GetMythMainWindow()->IsExitingToMain()) |
| 3481 | { |
| 3482 | PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__); |
| 3483 | mctx->LockDeletePlayer(__FILE__, __LINE__); |
| 3484 | if (mctx->player) |
| 3485 | { |
| 3486 | mctx->player->DisableEdit(true/*save changes*/); |
| 3487 | PrepareToExitPlayer(mctx, __LINE__); |
| 3488 | SetExitPlayer(true, true); |
| 3489 | } |
| 3490 | mctx->UnlockDeletePlayer(__FILE__, __LINE__); |
| 3491 | ReturnPlayerLock(mctx); |
| 3492 | } |
| 3493 | |
3480 | 3494 | if (QEvent::Resize == e->type()) |
3481 | 3495 | { |
3482 | 3496 | PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__); |
diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
index dfac790..85a6e7d 100644
a
|
b
|
bool PlaybackBox::Play( |
2425 | 2425 | |
2426 | 2426 | m_playingSomething = false; |
2427 | 2427 | |
2428 | | if (inPlaylist && !m_playListPlay.empty()) |
| 2428 | if (inPlaylist && !m_playListPlay.empty() && |
| 2429 | !GetMythMainWindow()->IsExitingToMain()) |
2429 | 2430 | { |
2430 | 2431 | QCoreApplication::postEvent( |
2431 | 2432 | this, new MythEvent("PLAY_PLAYLIST")); |