Removed declaration of pv::MainWindow::decoder_name_cmp

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 8936574a4e238c3f9b3fa65afce4a92985bdee8c..2e7be37f9fb499e85156bd8480330d80059e7b89 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -118,6 +118,7 @@ void SigSession::load_file(const string &name,
                sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
                g_slist_free(devlist);
 
+               _decode_traces.clear();
                update_signals(sdi);
                read_sample_rate(sdi);
 
@@ -132,6 +133,7 @@ void SigSession::load_file(const string &name,
                        error_handler)))
                        return;
 
+               _decode_traces.clear();
                update_signals(in->sdi);
                read_sample_rate(in->sdi);
 
@@ -221,7 +223,8 @@ bool SigSession::add_decoder(srd_decoder *const dec)
                        {
                                shared_ptr<view::LogicSignal> l =
                                        dynamic_pointer_cast<view::LogicSignal>(s);
-                               if (l && QString(probe->name).toLower().contains(
+                               if (l && QString::fromUtf8(probe->name).
+                                       toLower().contains(
                                        l->get_name().toLower()))
                                        probes[probe] = l;
                        }