This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new d5e916d jewel-togglebuttonbar: fix NPE
d5e916d is described below
commit d5e916da64c5508e13d1fb567b299f6837df6c80
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Feb 12 12:47:50 2021 +0100
jewel-togglebuttonbar: fix NPE
---
.../royale/jewel/beads/views/ToggleButtonBarView.as | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
index c90f645..e3a053b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
@@ -62,16 +62,19 @@ package org.apache.royale.jewel.beads.views
var prev_ir:ToggleButtonBarItemRenderer =
dataGroup.getItemRendererAt(lastSelectedIndex) as ToggleButtonBarItemRenderer;
var ir:ToggleButtonBarItemRenderer =
dataGroup.getItemRendererAt(listModel.selectedIndex) as
ToggleButtonBarItemRenderer;
- if(prev_ir != ir)
+ if(listModel.selectedIndex != -1)
{
- if(prev_ir)
- prev_ir.selected = false;
- ir.selected = true;
- } else {
- if(listModel.selectedIndex == ir.index &&
ir.selected)
+ if(prev_ir != ir)
{
- ir.selected = false;
- listModel.selectedIndex = -1;
+ if(prev_ir)
+ prev_ir.selected = false;
+ ir.selected = true;
+ } else {
+ if(listModel.selectedIndex == ir.index
&& ir.selected)
+ {
+ ir.selected = false;
+ listModel.selectedIndex = -1;
+ }
}
}
