oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gizmos

Browse Source
This commit is contained in:
itsmattkc
2020-05-05 01:05:52 +10:00
parent c387ce1cd7 30efe054c7
commit 54baba63f9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/track/tracklist.cpp
+5 -1
View File
@@ -57,7 +57,11 @@ const QVector<TrackOutput *> &TrackList::GetTracks() 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
app/widget/colorwheel/colorspacechooser.cpp
+4 -1
View File
@@ -85,7 +85,6 @@ ColorSpaceChooser::ColorSpaceChooser(ColorManager* color_manager, bool enable_in
display_combobox_->setCurrentText(color_manager_->GetDefaultDisplay());
connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::ComboBoxChanged);
connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::UpdateViews);
}
row++;
@@ -184,6 +183,10 @@ void ColorSpaceChooser::UpdateViews(const QString& display)
void ColorSpaceChooser::ComboBoxChanged()
{
if (sender() == display_combobox_) {
UpdateViews(display_combobox_->currentText());
}
if (input_combobox_) {
emit InputColorSpaceChanged(input());
}