Fix #605 by closing current device when another is selected

[pulseview.git] / pv / devices / sessionfile.cpp

diff --git a/pv/devices/sessionfile.cpp b/pv/devices/sessionfile.cpp
index 687c52bdcd5a225a29d1cdfaeffac104b7c4c9a3..e6920ff5e299a6a5b5e437b2768d3d020549f2e0 100644 (file)
--- a/pv/devices/sessionfile.cpp
+++ b/pv/devices/sessionfile.cpp
@@ -27,24 +27,24 @@
 namespace pv {
 namespace devices {
 
-SessionFile::SessionFile(const std::shared_ptr<sigrok::Context> &context,
+SessionFile::SessionFile(const std::shared_ptr<sigrok::Context> context,
        const std::string &file_name) :
-       context_(context),
-       file_name_(file_name) {
+       File(file_name),
+       context_(context) {
 }
 
-std::string SessionFile::full_name() const {
-       return boost::filesystem::path(file_name_).filename().string();
-}
-
-std::string SessionFile::display_name(const DeviceManager&) const {
-       return SessionFile::full_name();
-}
+void SessionFile::open() {
+       if (session_)
+               close();
 
-void SessionFile::create() {
        session_ = context_->load_session(file_name_);
        device_ = session_->devices()[0];
 }
 
+void SessionFile::close() {
+       if (session_)
+               session_->remove_devices();
+}
+
 } // namespace devices
 } // namespace pv