X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=4823543213de5b5a080be2ea732d1086aefa4bae;hp=56ac89975f65e97c47d4f28a2de96142b4f6316d;hb=4d6c6ea3e6b069787c270d4911083dae05eae4c6;hpb=ff4bf6bd8141b9e7518b7bf431e45beff671e764

diff --git a/pv/session.cpp b/pv/session.cpp
index 56ac8997..48235432 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -127,8 +127,11 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	// Ensure we are not capturing before setting the device
 	stop_capture();
 
+	if (device_)
+		device_->close();
+
 	device_ = std::move(device);
-	device_->create();
+	device_->open();
 	device_->session()->add_datafeed_callback([=]
 		(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
@@ -419,6 +422,8 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 
 	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
+	out_of_memory_ = false;
+
 	try {
 		device_->start();
 	} catch(Error e) {
@@ -438,6 +443,9 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 		qDebug("SR_DF_END was not received.");
 		assert(0);
 	}
+
+	if (out_of_memory_)
+		error_handler(tr("Out of memory, acquisition stopped."));
 }
 
 void Session::feed_in_header()
@@ -590,11 +598,21 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 		break;
 
 	case SR_DF_LOGIC:
-		feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
+		try {
+			feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
+		} catch (std::bad_alloc) {
+			out_of_memory_ = true;
+			device_->stop();
+		}
 		break;
 
 	case SR_DF_ANALOG:
-		feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
+		try {
+			feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
+		} catch (std::bad_alloc) {
+			out_of_memory_ = true;
+			device_->stop();
+		}
 		break;
 
 	case SR_DF_END: