diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index 0275980fa0cd..8896a8bb02a9 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -868,7 +868,9 @@ void TASInputDlg::UpdateStickBitmap(Stick stick) x = 256 - (u8)x; if (stick.y_cont.reverse) y = 256 - (u8)y; - stick.bitmap->SetBitmap(CreateStickBitmap(x, y)); + // If TASInputDlg::UpdateFromText(wxCommandEvent&) interrupts stick initialization, this bitmap is a nullptr + if (stick.bitmap != nullptr) + stick.bitmap->SetBitmap(CreateStickBitmap(x, y)); } void TASInputDlg::OnCloseWindow(wxCloseEvent& event)