Fixed two bugs in blue key handling

This commit is contained in:
louis 2014-01-15 17:30:06 +01:00
parent a8b7c95434
commit 88bb260f4d
4 changed files with 7 additions and 4 deletions

View File

@ -28,7 +28,7 @@ cTvguideConfig::cTvguideConfig() {
hugeStepHours = 24; hugeStepHours = 24;
channelJumpMode = eNumJump; channelJumpMode = eNumJump;
jumpChannels = 0; jumpChannels = 0;
blueKeyMode = eBlueKeySwitch; blueKeyMode = 0;
closeOnSwitch = 1; closeOnSwitch = 1;
numkeyMode = 0; numkeyMode = 0;
useRemoteTimers = 0; useRemoteTimers = 0;

View File

@ -30,12 +30,14 @@ enum {
eStyleFlat eStyleFlat
}; };
enum {
eBlueKeySwitch, enum eBlueKeyMode {
eBlueKeySwitch = 0,
eBlueKeyEPG, eBlueKeyEPG,
eBlueKeyFavorites eBlueKeyFavorites
}; };
class cTvguideConfig { class cTvguideConfig {
private: private:
public: public:

View File

@ -87,6 +87,7 @@ void cFooter::LeaveDetailedViewMode(const cChannel *channel) {
if (tvguideConfig.channelJumpMode == eNumJump) { if (tvguideConfig.channelJumpMode == eNumJump) {
drawGreenButton(); drawGreenButton();
drawYellowButton(); drawYellowButton();
drawBlueButton();
} else { } else {
UpdateGroupButtons(channel, true); UpdateGroupButtons(channel, true);
} }

View File

@ -670,7 +670,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
osdManager.flush(); osdManager.flush();
state = osContinue; state = osContinue;
} }
} else if ((Key & ~k_Repeat) == kOk && (tvguideConfig.blueKeyMode = eBlueKeyEPG)) { } else if ((Key & ~k_Repeat) == kOk && (tvguideConfig.blueKeyMode == eBlueKeyEPG)) {
delete detailView; delete detailView;
detailView = NULL; detailView = NULL;
detailViewActive = false; detailViewActive = false;