- sticky_scrolling_ && (session_.get_capture_state() == Session::Running)) {
- sticky_scrolling_ = false;
- sticky_scrolling_changed(false);
+ (session_.get_capture_state() == Session::Running)) {
+
+ if (sticky_scrolling_) {
+ sticky_scrolling_ = false;
+ sticky_scrolling_changed(false);
+ }
+
+ if (always_zoom_to_fit_) {
+ always_zoom_to_fit_ = false;
+ always_zoom_to_fit_changed(false);
+ }