Permalink
Browse files

libmythtv: MHEG ignores TEXTEXIT if no onscreen to allow Esc key binding

When browsing the MHEG service it is common to use the back button to
return to the previous page.  On many RCs this key sends Esc.
If the Back button (Esc) key is bound to TEXTEXIT then it isn't possible
to exit LiveTV because MHEG grabs the key.

This patch ignores TEXTEXIT key presses when there's nothing on screen
which allows the key to be passed on to TV playback and allow normal exit.

Signed-off-by: Lawrence Rust <lvr@softsystem.co.uk>
Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
  • Loading branch information...
Lawrence Rust authored and stuartm committed Jun 8, 2012
1 parent 542dc7f commit 8ae2abdca5fa31d2666670611a388695b6fed066
Showing with 3 additions and 1 deletion.
  1. +3 −1 mythtv/libs/libmythtv/mhi.cpp
@@ -531,7 +531,9 @@ bool MHIContext::OfferKey(QString key)
{ QMutexLocker locker(&m_keyLock);
m_keyQueue.enqueue(action);}
m_engine_wait.wakeAll();
return true;
// Accept the key except 'exit' (16) in 'always available' (3) state.
// This allows re-use of Esc as TEXTEXIT for RC's with a single backup button
return action != 16 || m_keyProfile != 3;
}
// Called from MythPlayer::VideoStart and MythPlayer::ReinitOSD

0 comments on commit 8ae2abd

Please sign in to comment.