Hopefully fixed a crash with mouse wheel on associations Window.

Originally committed to SVN as r1936.
This commit is contained in:
Rodrigo Braz Monteiro 2008-03-06 23:41:27 +00:00
parent cf3a233970
commit d9e254533a

View file

@ -93,6 +93,7 @@ void StartupLog(const wxString &msg) {
// Gets called when application starts, creates MainFrame // Gets called when application starts, creates MainFrame
bool AegisubApp::OnInit() { bool AegisubApp::OnInit() {
StartupLog(_T("Inside OnInit")); StartupLog(_T("Inside OnInit"));
frame = NULL;
try { try {
// Initialize randomizer // Initialize randomizer
StartupLog(_T("Initialize random generator")); StartupLog(_T("Initialize random generator"));
@ -409,7 +410,7 @@ END_EVENT_TABLE()
void AegisubApp::OnMouseWheel(wxMouseEvent &event) { void AegisubApp::OnMouseWheel(wxMouseEvent &event) {
wxPoint pt; wxPoint pt;
wxWindow *target = wxFindWindowAtPointer(pt); wxWindow *target = wxFindWindowAtPointer(pt);
if (target == frame->audioBox->audioDisplay || target == frame->SubsBox) { if (frame && (target == frame->audioBox->audioDisplay || target == frame->SubsBox)) {
if (target->IsShownOnScreen()) target->AddPendingEvent(event); if (target->IsShownOnScreen()) target->AddPendingEvent(event);
else event.Skip(); else event.Skip();
} }