diff --git a/mainwindow.cpp b/mainwindow.cpp index 83b6ff07d..454092cc2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -417,52 +417,39 @@ void MainWindow::on_actionReset_to_default_layout_triggered() void MainWindow::on_actionGo_to_start_triggered() { - if (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus()) { + if (sequence != NULL && (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus())) { panel_timeline->go_to_start(); } } void MainWindow::on_actionPrevious_Frame_triggered() { - if (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus()) { + if (sequence != NULL && (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus())) { panel_timeline->previous_frame(); } } void MainWindow::on_actionNext_Frame_triggered() { - if (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus()) { + if (sequence != NULL && (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus())) { panel_timeline->next_frame(); } } void MainWindow::on_actionGo_to_End_triggered() { - if (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus()) { + if (sequence != NULL && (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus())) { panel_timeline->go_to_end(); } } void MainWindow::on_actionPlay_Pause_triggered() { - if (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus()) { + if (sequence != NULL && (panel_timeline->focused() || panel_viewer->hasFocus() || panel_effect_controls->keyframe_focus())) { panel_timeline->toggle_play(); } } -void MainWindow::on_actionCrash_triggered() -{ - if (QMessageBox::warning(this, "Are you sure you want to crash?", "WARNING: This is a debugging function designed to crash the program. Olive WILL crash and any unsaved progress WILL be lost. Are you sure you wish to do this?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) { - // intentionally tries to crash the program - mostly used for debugging - Timeline* temp = NULL; - temp->snapped = true; - int* kek; - kek[5] = 69; - kek[99999] = kek[5]; - delete temp; - } -} - void MainWindow::on_actionEdit_Tool_triggered() { if (panel_timeline->focused()) panel_timeline->ui->toolEditButton->click(); @@ -500,14 +487,14 @@ void MainWindow::on_actionSlip_Tool_triggered() void MainWindow::on_actionGo_to_Previous_Cut_triggered() { - if (panel_timeline->focused() || panel_viewer->hasFocus()) { + if (sequence != NULL && (panel_timeline->focused() || panel_viewer->hasFocus())) { panel_timeline->previous_cut(); } } void MainWindow::on_actionGo_to_Next_Cut_triggered() { - if (panel_timeline->focused() || panel_viewer->hasFocus()) { + if (sequence != NULL && (panel_timeline->focused() || panel_viewer->hasFocus())) { panel_timeline->next_cut(); } } diff --git a/mainwindow.h b/mainwindow.h index 38cce2824..8e4a25fe3 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -84,9 +84,7 @@ private slots: void on_actionGo_to_End_triggered(); - void on_actionPlay_Pause_triggered(); - - void on_actionCrash_triggered(); + void on_actionPlay_Pause_triggered(); void on_actionEdit_Tool_triggered(); diff --git a/panels/timeline.cpp b/panels/timeline.cpp index 752252dbc..526a7f1a8 100644 --- a/panels/timeline.cpp +++ b/panels/timeline.cpp @@ -269,7 +269,7 @@ int Timeline::get_snap_range() { } bool Timeline::focused() { - return (ui->headers->hasFocus() || ui->video_area->hasFocus() || ui->audio_area->hasFocus()); + return (sequence != NULL && (ui->headers->hasFocus() || ui->video_area->hasFocus() || ui->audio_area->hasFocus())); } void Timeline::repaint_timeline() {