View: Fixes related to multi-segment display

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index a79396d15b04715b0bb5f33ea461214190d0d044..2bfe68c22468858d3bc24bd47034798dad78f607 100644 (file)
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -229,6 +229,9 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 
        // Update the zoom state
        calculate_tick_spacing();
+
+       // Make sure the standard bar's segment selector is in sync
+       set_segment_display_mode(segment_display_mode_);
 }
 
 Session& View::session()
@@ -497,7 +500,7 @@ void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
 
        segment_selectable_ = true;
 
-       if (mode == Trace::ShowSingleSegmentOnly)
+       if (mode == Trace::ShowLastSegmentOnly)
                segment_selectable_ = false;
 
        segment_display_mode_changed(segment_selectable_);
@@ -1423,6 +1426,8 @@ void View::on_segment_changed(int segment)
                current_segment_ = segment;
                for (shared_ptr<Signal> signal : signals_)
                        signal->set_current_segment(current_segment_);
+               for (shared_ptr<DecodeTrace> dt : decode_traces_)
+                       dt->set_current_segment(current_segment_);
                viewport_->update();
                break;