fix ASSERT in the correct way

diff --git a/lib/base/eerror.h b/lib/base/eerror.h
index 5a66b31e9735a99f3939a3c928765463c287e53b..e7c33a0bb8d3dfb08d8abe0b8eff8bb54a4aee5f 100644 (file)
--- a/lib/base/eerror.h
+++ b/lib/base/eerror.h
@@ -135,7 +135,7 @@ enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
     inline void eWarning(const char* fmt, ...)
     {
     }
-    #define ASSERT(x) do { x; } while (0)
+    #define ASSERT(x) do { } while (0)
 #endif //DEBUG
 
 void eWriteCrashdump();

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 91fad0a6d312d6d41e17b922bedacd0e75286cd1..d8301db8d5cbf1ae0acd1c7ffcef84eac3d918cb 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -2013,7 +2013,8 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
        {
                ASSERT(m_sec);
                eDVBFrontendParametersSatellite sat_parm;
-               ASSERT(!feparm->getDVBS(sat_parm));
+               int ret = feparm->getDVBS(sat_parm);
+               ASSERT(!ret);
                return m_sec->canTune(sat_parm, this, 1 << m_fe);
        }
        else if (m_type == eDVBFrontend::feCable)