From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 12 Feb 2010 13:23:06 +0000 (+0100)
Subject: Merge branch 'bug_411_timeshift_disable_without_live'
X-Git-Tag: 2.8.0~56
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/a37ddbb7785de5f1d944f4937a5b2914ce6a3862?ds=inline;hp=-c

Merge branch 'bug_411_timeshift_disable_without_live'
---

a37ddbb7785de5f1d944f4937a5b2914ce6a3862
diff --combined lib/service/servicedvb.cpp
index 1a3cb0e0,9f10644c..558bf0c2
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@@ -1128,7 -1128,11 +1128,7 @@@ RESULT eDVBServicePlay::stop(
  			
  			if (length)
  			{
 -				int perc = play_position * 100LL / length;
 -			
 -					/* only store last play position when between 1% and 99% */
 -				if ((1 < perc) && (perc < 99))
 -					m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
 +				m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
  			}
  			m_cuesheet_changed = 1;
  		}
@@@ -2085,12 -2089,13 +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;