diff --git a/src/apps/launchbox/PadView.cpp b/src/apps/launchbox/PadView.cpp index 6166826f90..080e1a22c1 100644 --- a/src/apps/launchbox/PadView.cpp +++ b/src/apps/launchbox/PadView.cpp @@ -297,7 +297,10 @@ PadView::RemoveButton(LaunchButton* button) LaunchButton* PadView::ButtonAt(int32 index) const { - return dynamic_cast(ChildAt(index)); + BLayoutItem* item = fButtonLayout->ItemAt(index); + if (item == NULL) + return NULL; + return dynamic_cast(item->View()); }