diff options
| author | louis <louis.braun@gmx.de> | 2014-01-22 17:43:53 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2014-01-22 17:43:53 +0100 |
| commit | 5132a3058ac546990f560ed23880e89835bb5128 (patch) | |
| tree | 81ba677e1cd29812a60d6baf2dc2c8d57077c213 /tvguideosd.c | |
| parent | a65fca41d87e69007369662368ef3ac14902297b (diff) | |
| download | vdr-plugin-tvguide-5132a3058ac546990f560ed23880e89835bb5128.tar.gz vdr-plugin-tvguide-5132a3058ac546990f560ed23880e89835bb5128.tar.bz2 | |
fixed a possible deadlock when switching to a channel which is not available
Diffstat (limited to 'tvguideosd.c')
| -rw-r--r-- | tvguideosd.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/tvguideosd.c b/tvguideosd.c index 696b791..15f84bd 100644 --- a/tvguideosd.c +++ b/tvguideosd.c @@ -499,9 +499,9 @@ void cTvGuideOsd::processKeyYellow() { }
}
-eOSState cTvGuideOsd::processKeyBlue() {
+eOSState cTvGuideOsd::processKeyBlue(bool *alreadyUnlocked) {
if (tvguideConfig.blueKeyMode == eBlueKeySwitch) {
- return ChannelSwitch();
+ return ChannelSwitch(alreadyUnlocked);
} else if (tvguideConfig.blueKeyMode == eBlueKeyEPG) {
DetailedEPG();
} else if (tvguideConfig.blueKeyMode == eBlueKeyFavorites) {
@@ -510,22 +510,24 @@ eOSState cTvGuideOsd::processKeyBlue() { return osContinue;
}
-eOSState cTvGuideOsd::processKeyOk() {
+eOSState cTvGuideOsd::processKeyOk(bool *alreadyUnlocked) {
if (tvguideConfig.blueKeyMode == eBlueKeySwitch) {
DetailedEPG();
} else if (tvguideConfig.blueKeyMode == eBlueKeyEPG) {
- return ChannelSwitch();
+ return ChannelSwitch(alreadyUnlocked);
} else if (tvguideConfig.blueKeyMode == eBlueKeyFavorites) {
DetailedEPG();
}
return osContinue;
}
-eOSState cTvGuideOsd::ChannelSwitch() {
+eOSState cTvGuideOsd::ChannelSwitch(bool *alreadyUnlocked) {
if (activeGrid == NULL)
return osContinue;
const cChannel *currentChannel = activeGrid->column->getChannel();
if (currentChannel) {
+ cPixmap::Unlock();
+ *alreadyUnlocked = true;
cDevice::PrimaryDevice()->SwitchChannel(currentChannel, true);
if (tvguideConfig.closeOnSwitch) {
if (detailView) {
@@ -647,6 +649,7 @@ void cTvGuideOsd::SetTimers() { eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
eOSState state = osContinue;
cPixmap::Lock();
+ bool alreadyUnlocked = false;
if (recMenuManager->isActive()) {
state = recMenuManager->ProcessKey(Key);
if (state == osEnd) {
@@ -664,9 +667,9 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) { delete detailView;
detailView = NULL;
detailViewActive = false;
- if ((tvguideConfig.blueKeyMode == eBlueKeySwitch) || (tvguideConfig.blueKeyMode == eBlueKeyFavorites))
- state = ChannelSwitch();
- else {
+ if ((tvguideConfig.blueKeyMode == eBlueKeySwitch) || (tvguideConfig.blueKeyMode == eBlueKeyFavorites)) {
+ state = ChannelSwitch(&alreadyUnlocked);
+ } else {
osdManager.flush();
state = osContinue;
}
@@ -674,7 +677,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) { delete detailView;
detailView = NULL;
detailViewActive = false;
- state = ChannelSwitch();
+ state = ChannelSwitch(&alreadyUnlocked);
} else {
state = detailView->ProcessKey(Key);
if (state == osEnd) {
@@ -694,15 +697,17 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) { case kRed: processKeyRed(); break;
case kGreen: processKeyGreen(); break;
case kYellow: processKeyYellow(); break;
- case kBlue: state = processKeyBlue(); break;
- case kOk: state = processKeyOk(); break;
+ case kBlue: state = processKeyBlue(&alreadyUnlocked); break;
+ case kOk: state = processKeyOk(&alreadyUnlocked); break;
case kBack: state=osEnd; break;
case k0 ... k9: processNumKey(Key - k0); break;
case kNone: if (channelJumper) CheckTimeout(); break;
default: break;
}
}
- cPixmap::Unlock();
+ if (!alreadyUnlocked) {
+ cPixmap::Unlock();
+ }
return state;
}
|