X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=2a4814f807e2be19fe0c4aeef93d5abfb982e13f;hp=ecbb47229693c73faf7773354c58e242b888ab49;hb=4365a4406b5a81a12c6a7d0fbaed01f6d59df882;hpb=b48daed65bff5da5fddc6db11377b8730220865f

diff --git a/pv/session.cpp b/pv/session.cpp
index ecbb472..2a4814f 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -477,18 +477,8 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		set_capture_state(Running);
 
 		// Get sample limit.
-		assert(device_);
-		const std::shared_ptr<sigrok::Device> device =
-			device_->device();
-		assert(device);
-		const auto keys = device->config_keys(
-			ConfigKey::DEVICE_OPTIONS);
-		const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
-		const uint64_t sample_limit = (iter != keys.end() &&
-			(*iter).second.find(sigrok::GET) !=
-			(*iter).second.end()) ?
-			VariantBase::cast_dynamic<Variant<guint64>>(
-			device->config_get(ConfigKey::LIMIT_SAMPLES)).get() : 0;
+		const uint64_t sample_limit = device_->read_config<uint64_t>(
+			ConfigKey::LIMIT_SAMPLES);
 
 		// Create a new data segment
 		cur_logic_segment_ = shared_ptr<data::LogicSegment>(