git commit: [flex-utilities] [refs/heads/develop] - use flag to keep cleanup from running twice

[ah...@apache.org]

Repository: flex-utilities
Updated Branches:
  refs/heads/develop f00dba92e -> ddbd01e2a


use flag to keep cleanup from running twice


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/ddbd01e2
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/ddbd01e2
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/ddbd01e2

Branch: refs/heads/develop
Commit: ddbd01e2a904d276f51f3e94e53b6065bdd3d9c5
Parents: f00dba9
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jun 10 12:58:06 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jun 10 12:58:06 2014 -0700

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ddbd01e2/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index d9724c4..a9d1f66 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -148,6 +148,8 @@ variables are not required because the locations of these pieces are known.
         [Embed(source="properties/en_US.properties",mimeType="application/octet-stream")]
         private var en_US_Properties:Class;
         
+        private var cleanedUp:Boolean;
+        
 		private var _mirrorURLCGI:String;
 		private var _useMirror:Boolean = true;
 		private var _latestVersion:String;
@@ -2186,6 +2188,11 @@ variables are not required because the locations of these pieces are known.
 		}
 		
 		protected function cleanup(isAbort:Boolean = false, abortInfo:String = ""):void {
+			if (cleanedUp)
+				return;
+				
+			cleanedUp = true;
+			
             CursorManager.removeBusyCursor();
             if (!_viewResourceConstants)
                 selectDefaultLanguageInEmergency();

Re: git commit: [flex-utilities] [refs/heads/develop] - use flag to keep cleanup from running twice

[OmPrakash Muppirala <bi...@gmail.com>]

On Jun 10, 2014 1:09 PM, "Alex Harui" <ah...@adobe.com> wrote:
>
> No, cleanup is called in this scenario after the last step.  But htting
> the close button to close the main window also calls cleanup, which it
> should if you bail out before you get to the last step.  I suppose I could
> have added a flag about whether we'd finished up the last step and have
> the close button handler not call cleanup.  Or maybe the better fix is to
> close the log window when the close button is clicked then you wouldn't
> see this (which has been this way for a while I think).  I wonder if there
> is a reason to leave the log window up if you close the main window.

No real reason.  We probably just forgot to implement that.

Thanks,
Om

>
> -Alex
>
> On 6/10/14 1:02 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
>
> >Hi,
> >
> >Not 100% sure - but seems a little suspect to me in it may try to clean
> >uo before the last step???
> >
> >Justin
>

Re: git commit: [flex-utilities] [refs/heads/develop] - use flag to keep cleanup from running twice

[Alex Harui <ah...@adobe.com>]

No, cleanup is called in this scenario after the last step.  But htting
the close button to close the main window also calls cleanup, which it
should if you bail out before you get to the last step.  I suppose I could
have added a flag about whether we'd finished up the last step and have
the close button handler not call cleanup.  Or maybe the better fix is to
close the log window when the close button is clicked then you wouldn't
see this (which has been this way for a while I think).  I wonder if there
is a reason to leave the log window up if you close the main window.

-Alex

On 6/10/14 1:02 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:

>Hi,
>
>Not 100% sure - but seems a little suspect to me in it may try to clean
>uo before the last step???
>
>Justin

Re: git commit: [flex-utilities] [refs/heads/develop] - use flag to keep cleanup from running twice

[Justin Mclean <ju...@classsoftware.com>]

Hi,

Not 100% sure - but seems a little suspect to me in it may try to clean uo before the last step???

Justin