summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2010-11-17 09:40:20 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2010-11-17 09:40:20 (GMT)
commit3f2dc41d93483d04b9a9c365ba127b745f318afb (patch)
treef1736e63b4ef5505b73f16137c56360b87abf483
parent3eeb6bf153bfef9ee89b1206ec97e78046c7171e (diff)
Don't hold the OSD lock unnecessarily when processing editor keypresses.
Refs #9234 (and should fix it) git-svn-id: http://svn.mythtv.org/svn/trunk@27256 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 497428c..132f5ce 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -3617,8 +3617,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);
@@ -3663,7 +3664,6 @@ void TV::ProcessKeypress(PlayerContext *actx, QKeyEvent *e)
if (handled)
editmode = actx->player->GetEditMode();
}
- ReturnOSDLock(actx, osd);
if (handled)
return;