From d01d7eb78b92f0eaa9ee7bc013cec1d886ad7e16 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 29 Dec 2011 15:12:36 +0000 Subject: [PATCH] Fix crash when the audio commit hotkey is pressed with the grid focused and no audio open Originally committed to SVN as r6185. --- aegisub/src/command/audio.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp index 35a078ec7..5367a1666 100644 --- a/aegisub/src/command/audio.cpp +++ b/aegisub/src/command/audio.cpp @@ -330,14 +330,15 @@ struct audio_play_to_end : public validate_audio_open { /// Commit any pending audio timing changes /// @todo maybe move to time? -struct audio_commit : public Command { +struct audio_commit : public validate_audio_open { CMD_NAME("audio/commit") STR_MENU("Commit") STR_DISP("Commit") STR_HELP("Commit") void operator()(agi::Context *c) { - c->audioController->GetTimingController()->Commit(); + AudioTimingController *tc = c->audioController->GetTimingController(); + if (tc) tc->Commit(); } };