diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-01-22 15:07:57 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-01-22 15:07:57 +0100 |
| commit | 59dece7572bea6bb8aa0391c32774363c62fd71e (patch) | |
| tree | d779e8732e3f27903956338a61e8f90ccfc5e171 /lib/service/servicedvb.cpp | |
| parent | 6551b5fbbed0acb407e3eba5c9c510ca74e352f7 (diff) | |
| parent | 39bcbbae7cd1d2db59ddbf6cbae665313a322f3a (diff) | |
| download | enigma2-59dece7572bea6bb8aa0391c32774363c62fd71e.tar.gz enigma2-59dece7572bea6bb8aa0391c32774363c62fd71e.zip | |
Merge branch 'bug_411_timeshift_disable_without_live' into experimental
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 615329c9..25e723ed 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -2089,12 +2089,13 @@ RESULT eDVBServicePlay::startTimeshift() return 0; } -RESULT eDVBServicePlay::stopTimeshift() +RESULT eDVBServicePlay::stopTimeshift(bool switchToLive=true) { if (!m_timeshift_enabled) return -1; - switchToLive(); + if (switchToLive) + switchToLive(); m_timeshift_enabled = 0; |