Merge branch 'bug_411_timeshift_disable_without_live'

diff --combined lib/service/servicedvb.cpp
index 1a3cb0e00f01e799860e7738e936935c04919464,9f10644cec451692cf2a24fbad74606a46b16e19..558bf0c22cd0273428aa24577915a72b6182df3c
--- 1/lib/service/servicedvb.cpp
--- 2/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;