diff -Nur --exclude='*.lib' --exclude='*.o' mythtv/libs/libmythtv/tv_play.cpp mythtv-guide/libs/libmythtv/tv_play.cpp
old
|
new
|
|
1735 | 1756 | switchToRec = NULL; |
1736 | 1757 | runMainLoop = true; |
1737 | 1758 | exitPlayer = false; |
| 1759 | |
| 1760 | bool dvdwasinmenu = false; |
1738 | 1761 | |
1739 | 1762 | mainLoopCondLock.lock(); |
1740 | 1763 | mainLoopCond.wakeAll(); |
… |
… |
|
2048 | 2071 | DoDisplayJumpMenu(); |
2049 | 2072 | needToJumpMenu = false; |
2050 | 2073 | } |
| 2074 | |
| 2075 | // Check if in DVD menu. If so activate screensaver |
| 2076 | if (activerbuffer && activerbuffer->isDVD()) |
| 2077 | { |
| 2078 | if (activerbuffer->DVD()->IsInMenu() && !dvdwasinmenu) |
| 2079 | { |
| 2080 | dvdwasinmenu = true; |
| 2081 | gContext->RestoreScreensaver(); |
| 2082 | VERBOSE(VB_IMPORTANT, LOC + "In DVD menu, enabling screensaver"); |
| 2083 | } |
| 2084 | |
| 2085 | if (!activerbuffer->DVD()->IsInMenu() && dvdwasinmenu) |
| 2086 | { |
| 2087 | dvdwasinmenu = false; |
| 2088 | gContext->DisableScreensaver(); |
| 2089 | VERBOSE(VB_IMPORTANT, LOC + "Was in DVD menu, disabling screensaver"); |
| 2090 | } |
| 2091 | } |
2051 | 2092 | } |
2052 | 2093 | |
2053 | 2094 | if (!IsErrored() && (GetState() != kState_None)) |