[SCM] kodi-pvr-hts/master: fix some comparison operators, fixes issue where "unknown channel 0" appears when the first channel update comes through

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Wed Mar 2 23:01:45 UTC 2016


The following commit has been merged in the master branch:
commit 88769b9e43013a7f1731fcb10c98222678d00efa
Author: Sam Stenvall <sam.stenvall at nordsoftware.com>
Date:   Fri Oct 9 16:16:09 2015 +0300

    fix some comparison operators, fixes issue where "unknown channel 0"
    appears when the first channel update comes through

diff --git a/src/tvheadend/entity/Channel.h b/src/tvheadend/entity/Channel.h
index 3849cee..ed62328 100644
--- a/src/tvheadend/entity/Channel.h
+++ b/src/tvheadend/entity/Channel.h
@@ -67,7 +67,7 @@ namespace tvheadend
 
       bool operator!=(const Channel &other) const
       {
-        return !(this == &other);
+        return !(*this == other);
       }
 
       uint32_t GetNum() const { return m_num; }
diff --git a/src/tvheadend/entity/Event.h b/src/tvheadend/entity/Event.h
index 5db11ed..3e9afa1 100644
--- a/src/tvheadend/entity/Event.h
+++ b/src/tvheadend/entity/Event.h
@@ -80,7 +80,7 @@ namespace tvheadend
 
       bool operator!=(const Event &other) const
       {
-        return !(this == &other);
+        return !(*this == other);
       }
 
       uint32_t GetNext() const { return m_next; }
diff --git a/src/tvheadend/entity/Recording.h b/src/tvheadend/entity/Recording.h
index d3a3030..abb9242 100644
--- a/src/tvheadend/entity/Recording.h
+++ b/src/tvheadend/entity/Recording.h
@@ -86,7 +86,7 @@ namespace tvheadend
 
       bool operator!=(const Recording &other) const
       {
-        return !(this == &other);
+        return !(*this == other);
       }
 
       bool IsRecording() const

-- 
kodi-pvr-hts packaging



More information about the pkg-multimedia-commits mailing list