summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2010-11-18 06:58:27 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2010-11-18 06:58:27 (GMT)
commit10f251f13b3766f1ac2e6a2c399a6dc234cc734e (patch)
treee6aff005f0c883114f01be690c78e6b8aec76f97
parentc8e66a476de6766ab1e4b980d8ed37e52065d517 (diff)
Backport r27256 from trunk to release-0-24-fixes
Don't hold the OSD lock unnecessarily when processing editor keypresses. Closes #9228 git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27278 7dbf422c-18fa-0310-86e9-fd20926502f2
-rw-r--r--mythtv/libs/libmythtv/tv_play.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index 5aab812..a63c447 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -3616,8 +3616,9 @@ void TV::ProcessKeypress(PlayerContext *actx, QKeyEvent *e)
osd->DialogHandleKeypress(e);
handled = true;
}
+ ReturnOSDLock(actx, osd);
- if (editmode && osd && !handled)
+ if (editmode && !handled)
{
handled |= GetMythMainWindow()->TranslateKeyPress(
"TV Editing", e, actions);
@@ -3654,7 +3655,6 @@ void TV::ProcessKeypress(PlayerContext *actx, QKeyEvent *e)
if (handled)
editmode = actx->player->GetEditMode();
}
- ReturnOSDLock(actx, osd);
if (handled)
return;