[SCM] kodi-pvr-hts/master: lower the subscription weight of the current subscription before promoting an old subscription to "normal" weight, otherwise we may end up with two normal weight subscriptions simultaneously (fixes #91)

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 48746f706a3a27e1ac641d99a5edb69d72c39683
Author: Sam Stenvall <sam.stenvall at nordsoftware.com>
Date:   Sun Oct 18 10:33:27 2015 +0300

    lower the subscription weight of the current subscription before
    promoting an old subscription to "normal" weight, otherwise we
    may end up with two normal weight subscriptions simultaneously
    (fixes #91)

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index a7183b6..83fbc47 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -1997,10 +1997,14 @@ bool CTvheadend::DemuxOpen( const PVR_CHANNEL &chn )
       tvhtrace("retuning channel %u on subscription %u",
                m_channels[chn.iUniqueId].GetNum(), dmx->GetSubscriptionId());
 
-      dmx->Weight(SUBSCRIPTION_WEIGHT_NORMAL);
+      /* Lower the priority on the current subscrption */
       m_dmx_active->Weight(SUBSCRIPTION_WEIGHT_POSTTUNING);
       prevId = m_dmx_active->GetChannelId();
+
+      /* Promote the lingering subscription to the active one */
+      dmx->Weight(SUBSCRIPTION_WEIGHT_NORMAL);
       m_dmx_active = dmx;
+
       PredictiveTune(prevId, chn.iUniqueId);
       m_streamchange = true;
       return true;

-- 
kodi-pvr-hts packaging