From c15f0ada623927b0ba4f9625946e98945d9c005c Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sat, 26 Jun 2010 14:09:15 +0000
Subject: [PATCH] Be more sure the audio display's grid pointer is initialised
 properly. Should fix audio loading.

Originally committed to SVN as r4605.
---
 aegisub/src/audio_display.cpp | 1 +
 aegisub/src/subs_grid.cpp     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index ac3024a84..32c95061d 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -82,6 +82,7 @@
 /// @param parent 
 AudioDisplay::AudioDisplay(wxWindow *parent)
 : wxWindow (parent, -1, wxDefaultPosition, wxSize(200,OPT_GET("Audio/Display Height")->GetInt()), AudioDisplayWindowStyle , _T("Audio Display"))
+, grid(0)
 {
 	// Set variables
 	origImage = NULL;
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index 83a1f8ea4..070ea71df 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -799,6 +799,10 @@ void SubtitlesGrid::LoadDefault () {
 	ass = AssFile::top;
 	ass->LoadDefault();
 	UpdateMaps();
+
+	assert(!line_iter_map.empty());
+	SetActiveLine(GetDialogue(0));
+	SelectRow(0);
 }