ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2689 from RisingFog/patch-1 

Fix TASInput Crash When Stick Bitmap Is Null
This commit is contained in:
skidau 2015-07-21 11:41:38 +10:00
parent cd95a53ff4 3639755120
commit 3d6ee7313d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -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)