From 5c10bfa2f3ef49e73ee7d1a74d5d82090e41ae37 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 18 May 2012 05:03:05 +0000 Subject: [PATCH] OS X: Fix crash when opening Find/Replace dialog Originally committed to SVN as r6820. --- aegisub/src/dialog_search_replace.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp index 3c43ff4f7..aef8f3f69 100644 --- a/aegisub/src/dialog_search_replace.cpp +++ b/aegisub/src/dialog_search_replace.cpp @@ -70,14 +70,16 @@ DialogSearchReplace::DialogSearchReplace(agi::Context* c, bool withReplace) { wxSizer *FindSizer = new wxFlexGridSizer(2,2,5,15); FindEdit = new wxComboBox(this,-1,"",wxDefaultPosition,wxSize(300,-1),lagi_MRU_wxAS("Find"),wxCB_DROPDOWN); - FindEdit->SetSelection(0); + if (!FindEdit->IsListEmpty()) + FindEdit->SetSelection(0); FindSizer->Add(new wxStaticText(this,-1,_("Find what:")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,0); FindSizer->Add(FindEdit,0,wxRIGHT,0); if (hasReplace) { ReplaceEdit = new wxComboBox(this,-1,"",wxDefaultPosition,wxSize(300,-1),lagi_MRU_wxAS("Replace"),wxCB_DROPDOWN); FindSizer->Add(new wxStaticText(this,-1,_("Replace with:")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,0); FindSizer->Add(ReplaceEdit,0,wxRIGHT,0); - ReplaceEdit->SetSelection(0); + if (!ReplaceEdit->IsListEmpty()) + ReplaceEdit->SetSelection(0); } wxSizer *OptionsSizer = new wxBoxSizer(wxVERTICAL); @@ -201,14 +203,16 @@ void DialogSearchReplace::UpdateDropDowns() { FindEdit->Freeze(); FindEdit->Clear(); FindEdit->Append(lagi_MRU_wxAS("Find")); - FindEdit->SetSelection(0); + if (!FindEdit->IsListEmpty()) + FindEdit->SetSelection(0); FindEdit->Thaw(); if (hasReplace) { ReplaceEdit->Freeze(); ReplaceEdit->Clear(); ReplaceEdit->Append(lagi_MRU_wxAS("Replace")); - ReplaceEdit->SetSelection(0); + if (!ReplaceEdit->IsListEmpty()) + ReplaceEdit->SetSelection(0); ReplaceEdit->Thaw(); } }