PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix render issue when button has conditional

Browse Source 
If the button has a conditional, the image render function will
return a 0 which indicated that an image was present even if it
was not if the condition was not being met during boot. When the
condition is met, mButtonImg was not set to NULL causing a render
request failure.

Change-Id: I32be0ddcdc1bf7ad22440d66018ef09484280afa
This commit is contained in:
Dees Troy
2013-11-29 05:02:40 +00:00
parent 995e88cfbe
commit 4168a07310
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/button.cpp
+9 -5
View File
@@ -58,15 +58,19 @@ GUIButton::GUIButton(xml_node<>* node)
if (!node) return;
// Three of the four can be loaded directly from the node
mButtonImg = new GUIImage(node);
// These can be loaded directly from the node
mButtonLabel = new GUIText(node);
mAction = new GUIAction(node);
if (mButtonImg->Render() < 0)
child = node->first_node("image");
if (child)
{
delete mButtonImg;
mButtonImg = NULL;
mButtonImg = new GUIImage(node);
if (mButtonImg->Render() < 0)
{
delete mButtonImg;
mButtonImg = NULL;
}
}
if (mButtonLabel->Render() < 0)
{