diff --git a/app/widget/handmovableview/handmovableview.cpp b/app/widget/handmovableview/handmovableview.cpp index 87ccd2cc7..dfcf6fbad 100644 --- a/app/widget/handmovableview/handmovableview.cpp +++ b/app/widget/handmovableview/handmovableview.cpp @@ -34,6 +34,7 @@ namespace olive HandMovableView::HandMovableView(QWidget *parent) : super(parent) , dragging_hand_(false) + , default_drag_mode_(NoDrag) , is_timeline_axes_(false) { connect(Core::instance(), &Core::ToolChanged, this, diff --git a/app/widget/standardcombos/frameratecombobox.h b/app/widget/standardcombos/frameratecombobox.h index ac8ecbb47..b38684817 100644 --- a/app/widget/standardcombos/frameratecombobox.h +++ b/app/widget/standardcombos/frameratecombobox.h @@ -177,7 +177,9 @@ private: .arg(VideoParams::FrameRateToString(custom_rate_))); } - inner_->setCurrentIndex(temp_index); + // On the first populate there is no current index (-1); select the + // first standard rate so GetFrameRate() matches what's displayed + inner_->setCurrentIndex(qMax(temp_index, 0)); inner_->blockSignals(false); }