Ensure sr_config_get is called even when assert is compiled out

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index fc26a23d784b0f5b2c11fecf993e01358f582428..b2670b6fbfcc908089ae7cc5b52704773ac33db3 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -172,7 +172,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
        shared_ptr<view::Signal> signal;
-       uint64_t *sample_rate;
+       uint64_t *sample_rate = NULL;
        unsigned int logic_probe_count = 0;
        unsigned int analog_probe_count = 0;
 
@@ -195,8 +195,10 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
 
        // Read out the sample rate
        assert(sdi->driver);
-       assert(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-               (const void**)&sample_rate, sdi) == SR_OK);
+
+       const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+               (const void**)&sample_rate, sdi);
+       assert(ret == SR_OK);
 
        // Create data containers for the coming data snapshots
        {