[royale-asjs] branch develop updated: Make sure we don't remove a loader that doesn't exist

[yishayw]

This is an automated email from the ASF dual-hosted git repository.

yishayw 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 86b3aba  Make sure we don't remove a loader that doesn't exist
     new 80000c7  Merge branch 'develop' of 
https://github.com/apache/royale-asjs into develop
86b3aba is described below

commit 86b3aba9dd14c9c0ab14aee542547e066475e5d3
Author: DESKTOP-RH4S838\Yishay <yishayj...@hotmail.com>
AuthorDate: Fri Apr 12 11:59:11 2019 +0300

    Make sure we don't remove a loader that doesn't exist
---
 .../main/royale/org/apache/royale/html/beads/DisableLoaderBead.as   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableLoaderBead.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableLoaderBead.as
index 1ce5e3d..a233bdf 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableLoaderBead.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableLoaderBead.as
@@ -110,7 +110,7 @@ package org.apache.royale.html.beads
                                if (disabled)
                                {
                                        addLoadIndicator();
-                               } else
+                               } else if (_loader)
                                {
                                        removeLoadIndicator();
                                }
@@ -129,8 +129,8 @@ package org.apache.royale.html.beads
                        {
                                _loader.element.style.position = "absolute";
                        }
-                               var popupHost:IPopUpHost = 
UIUtils.findPopUpHost(_strand as IUIBase);
-                               popupHost.popUpParent.addElement(_loader);
+                       var popupHost:IPopUpHost = 
UIUtils.findPopUpHost(_strand as IUIBase);
+                       popupHost.popUpParent.addElement(_loader);
                }
                
                protected function removeLoadIndicator():void