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

Merge branch 'master' into nodeview-redux

Browse Source
This commit is contained in:
itsmattkc
2021-05-27 13:21:10 +10:00
parent c9305b9368 91c88b1ccf
commit 0c5c9f0794
11 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/window/mainwindow/mainwindow.cpp
+3 -1
View File
@@ -710,7 +710,9 @@ void MainWindow::SaveCustomShortcuts()
void MainWindow::UpdateAudioMonitorParams(ViewerOutput *viewer)
{
audio_monitor_panel_->SetParams(viewer ? viewer->GetAudioParams() : AudioParams());
if (!audio_monitor_panel_->IsPlaying()) {
audio_monitor_panel_->SetParams(viewer ? viewer->GetAudioParams() : AudioParams());
}
}
void MainWindow::UpdateNodePanelContextFromTimelinePanel(TimelinePanel *panel)