diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-02-12 14:23:06 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-02-12 14:23:06 +0100 |
| commit | a37ddbb7785de5f1d944f4937a5b2914ce6a3862 (patch) | |
| tree | e3fc570edabdb51535361ce8a31bc117a913762d /lib/service/servicedvb.cpp | |
| parent | ae12f5e4894a65289aeafd97931e1651939bf8b1 (diff) | |
| parent | 83a674f998012f616a3ed7e7b7043e498fd93e09 (diff) | |
| download | enigma2-a37ddbb7785de5f1d944f4937a5b2914ce6a3862.tar.gz enigma2-a37ddbb7785de5f1d944f4937a5b2914ce6a3862.zip | |
Merge branch 'bug_411_timeshift_disable_without_live'
Diffstat (limited to 'lib/service/servicedvb.cpp')
| -rw-r--r-- | lib/service/servicedvb.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 1a3cb0e0..558bf0c2 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -2085,12 +2085,13 @@ RESULT eDVBServicePlay::startTimeshift() return 0; } -RESULT eDVBServicePlay::stopTimeshift() +RESULT eDVBServicePlay::stopTimeshift(bool swToLive) { if (!m_timeshift_enabled) return -1; - switchToLive(); + if (swToLive) + switchToLive(); m_timeshift_enabled = 0; |