Skip to content

Commit

Permalink
Don't hold the OSD lock unnecessarily when processing editor keypresses.
Browse files Browse the repository at this point in the history
Refs #9234 (and should fix it)


git-svn-id: http://svn.mythtv.org/svn/trunk@27256 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information
Mark Kendall committed Nov 17, 2010
1 parent 3eeb6bf commit 3f2dc41
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/tv_play.cpp
Expand Up @@ -3617,8 +3617,9 @@ void TV::ProcessKeypress(PlayerContext *actx, QKeyEvent *e)
osd->DialogHandleKeypress(e); osd->DialogHandleKeypress(e);
handled = true; handled = true;
} }
ReturnOSDLock(actx, osd);


if (editmode && osd && !handled) if (editmode && !handled)
{ {
handled |= GetMythMainWindow()->TranslateKeyPress( handled |= GetMythMainWindow()->TranslateKeyPress(
"TV Editing", e, actions); "TV Editing", e, actions);
Expand Down Expand Up @@ -3663,7 +3664,6 @@ void TV::ProcessKeypress(PlayerContext *actx, QKeyEvent *e)
if (handled) if (handled)
editmode = actx->player->GetEditMode(); editmode = actx->player->GetEditMode();
} }
ReturnOSDLock(actx, osd);


if (handled) if (handled)
return; return;
Expand Down

0 comments on commit 3f2dc41

Please sign in to comment.