Ticket #7939: tv_jumppoints_v15.patch

File tv_jumppoints_v15.patch, 1.5 KB (added by Jim Stichnoth, 8 years ago)

Simplified version.

  • mythtv/libs/libmythtv/tv_play.cpp

    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) 
    34773477/// This handles all standard events
    34783478bool TV::event(QEvent *e)
    34793479{
     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
    34803494    if (QEvent::Resize == e->type())
    34813495    {
    34823496        PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
  • mythtv/programs/mythfrontend/playbackbox.cpp

    diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
    index dfac790..85a6e7d 100644
    a b bool PlaybackBox::Play( 
    24252425
    24262426    m_playingSomething = false;
    24272427
    2428     if (inPlaylist && !m_playListPlay.empty())
     2428    if (inPlaylist && !m_playListPlay.empty() &&
     2429        !GetMythMainWindow()->IsExitingToMain())
    24292430    {
    24302431        QCoreApplication::postEvent(
    24312432            this, new MythEvent("PLAY_PLAYLIST"));