Merge branch 'master' into gizmos
This commit is contained in:
@@ -57,7 +57,11 @@ const QVector<TrackOutput *> &TrackList::GetTracks() const
|
|||||||
|
|
||||||
TrackOutput *TrackList::GetTrackAt(int index) const
|
TrackOutput *TrackList::GetTrackAt(int index) const
|
||||||
{
|
{
|
||||||
return track_cache_.at(index);
|
if (index < track_cache_.size()) {
|
||||||
|
return track_cache_.at(index);
|
||||||
|
} else {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const rational &TrackList::GetTotalLength() const
|
const rational &TrackList::GetTotalLength() const
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ ColorSpaceChooser::ColorSpaceChooser(ColorManager* color_manager, bool enable_in
|
|||||||
display_combobox_->setCurrentText(color_manager_->GetDefaultDisplay());
|
display_combobox_->setCurrentText(color_manager_->GetDefaultDisplay());
|
||||||
|
|
||||||
connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::ComboBoxChanged);
|
connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::ComboBoxChanged);
|
||||||
connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::UpdateViews);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
row++;
|
row++;
|
||||||
@@ -184,6 +183,10 @@ void ColorSpaceChooser::UpdateViews(const QString& display)
|
|||||||
|
|
||||||
void ColorSpaceChooser::ComboBoxChanged()
|
void ColorSpaceChooser::ComboBoxChanged()
|
||||||
{
|
{
|
||||||
|
if (sender() == display_combobox_) {
|
||||||
|
UpdateViews(display_combobox_->currentText());
|
||||||
|
}
|
||||||
|
|
||||||
if (input_combobox_) {
|
if (input_combobox_) {
|
||||||
emit InputColorSpaceChanged(input());
|
emit InputColorSpaceChanged(input());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user