X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=024e3bf48d665b0043252551c72ef2202da80de5;hp=96b17fdaf25a9a791bf675e97c387b985d849b69;hb=68e0a53ee49c6a58fe1fadd8b9dc12572cc0dbd0;hpb=6b197c700a2065941671c5ef557dc80ba3c978ac

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 96b17fd..024e3bf 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -385,7 +385,7 @@ void View::restore_settings(QSettings &settings)
 			boost::archive::text_iarchive ia(ss);
 			ia >> boost::serialization::make_nvp("ruler_shift", shift);
 			ruler_shift_ = shift;
-		} catch (boost::archive::archive_exception) {
+		} catch (boost::archive::archive_exception&) {
 			qDebug() << "Could not restore the view ruler shift";
 		}
 	}
@@ -400,7 +400,7 @@ void View::restore_settings(QSettings &settings)
 			ia >> boost::serialization::make_nvp("offset", offset);
 			// This also updates ruler_offset_
 			set_offset(offset);
-		} catch (boost::archive::archive_exception) {
+		} catch (boost::archive::archive_exception&) {
 			qDebug() << "Could not restore the view offset";
 		}
 	}
@@ -1053,8 +1053,10 @@ void View::update_scroll()
 		vscrollbar->setRange(extents.first - areaSize.height(),
 			extents.second);
 
-	if (scroll_needs_defaults_)
+	if (scroll_needs_defaults_) {
 		set_scroll_default();
+		scroll_needs_defaults_ = false;
+	}
 }
 
 void View::reset_scroll()
@@ -1295,6 +1297,7 @@ void View::extents_changed(bool horz, bool vert)
 		(horz ? TraceTreeItemHExtentsChanged : 0) |
 		(vert ? TraceTreeItemVExtentsChanged : 0);
 
+	lazy_event_handler_.stop();
 	lazy_event_handler_.start();
 }