[Laszlo-checkins] r12738 - in openlaszlo/branches/4.2: . WEB-INF/lps/lfc/kernel/swf

[ptw@openlaszlo.org]

Author: ptw
Date: 2009-02-03 13:20:42 -0800 (Tue, 03 Feb 2009)
New Revision: 12738

Modified:
   openlaszlo/branches/4.2/
   openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
Log:
Merged revisions 12719 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r12719 | bargull | 2009-02-02 18:15:16 -0500 (Mon, 02 Feb 2009) | 27 lines
  
  Change 20090202-bargull-VdP by bargull at dell--p4--2-53 on 2009-02-02 23:46:59
      in /home/Admin/src/svn/openlaszlo/trunk
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: don't let queuedplayaction recurse
  
  New Features:
  
  Bugs Fixed: LPP-7707
  
  Technical Reviewer: ptw
  QA Reviewer: (pending)
  Doc Reviewer: (pending)
  
  Documentation:
  
  Release Notes:
  
  Details:
  Iterate over local copy of "queuedplayaction" and set sprite's "queuedplayaction" to null. 
  That way "doQueuedPlayAction" won't recurse indefinite. 
      
  
  Tests:
  both testcases from bugreport
.......



Property changes on: openlaszlo/branches/4.2
___________________________________________________________________
Name: svnmerge-integrated
   - /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12345,12360,12403,12420,12424,12429,12457,12473,12477,12508,12594,12596,12603,12664,12669,12675,12677
   + /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12345,12360,12403,12420,12424,12429,12457,12473,12477,12508,12594,12596,12603,12664,12669,12675,12677,12719

Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzSprite.as	2009-02-03 20:41:20 UTC (rev 12737)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzSprite.as	2009-02-03 21:20:42 UTC (rev 12738)
@@ -2,7 +2,7 @@
 /**
   * LzSprite.as
   *
-  * @copyright Copyright 2001-2008 Laszlo Systems, Inc.  All Rights Reserved.
+  * @copyright Copyright 2001-2009 Laszlo Systems, Inc.  All Rights Reserved.
   *            Use is subject to license terms.
   *
   * @topic Kernel
@@ -1444,6 +1444,7 @@
     this.doQueuedDel.unregisterAll();
     
     var qa = this.queuedplayaction;
+    this.queuedplayaction = null;
     for (var i = 0; i < qa.length; i += 3) {
         this[ qa[i] ] ( qa[i + 1], qa[i + 2] );
     }