Fixed two bugs in blue key handling

4 files changed, 7 insertions, 4 deletions

diff --git a/config.c b/config.c
index 837d5c5..885693e 100644
--- a/config.c
+++ b/config.c
@@ -28,7 +28,7 @@ cTvguideConfig::cTvguideConfig() {
     hugeStepHours = 24;

     channelJumpMode = eNumJump;

     jumpChannels = 0;

-    blueKeyMode = eBlueKeySwitch;

+    blueKeyMode = 0;

     closeOnSwitch = 1;

     numkeyMode = 0;

     useRemoteTimers = 0;

diff --git a/config.h b/config.h
index 3411e8b..9ffb6be 100644
--- a/config.h
+++ b/config.h
@@ -30,12 +30,14 @@ enum {
     eStyleFlat

 };

 

-enum {

-    eBlueKeySwitch,

+

+enum eBlueKeyMode {

+    eBlueKeySwitch = 0,

     eBlueKeyEPG,

     eBlueKeyFavorites

 };

 

+

 class cTvguideConfig {

     private:

     public:

diff --git a/footer.c b/footer.c
index 3e7b445..3e376d8 100644
--- a/footer.c
+++ b/footer.c
@@ -87,6 +87,7 @@ void cFooter::LeaveDetailedViewMode(const cChannel *channel) {
     if (tvguideConfig.channelJumpMode == eNumJump) {

         drawGreenButton();

         drawYellowButton();

+        drawBlueButton();

     } else {

         UpdateGroupButtons(channel, true);

     }

diff --git a/tvguideosd.c b/tvguideosd.c
index da170db..696b791 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -670,7 +670,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
                 osdManager.flush();

                 state = osContinue;

             }

-        } else if ((Key & ~k_Repeat) == kOk && (tvguideConfig.blueKeyMode = eBlueKeyEPG)) {

+        } else if ((Key & ~k_Repeat) == kOk && (tvguideConfig.blueKeyMode == eBlueKeyEPG)) {

             delete detailView;

             detailView = NULL;

             detailViewActive = false;