scratchfoundation/scratch-flash
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-flash.git synced 2024-12-04 21:21:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #232 from cpseager/master

Browse source 
Fix bug #140
This commit is contained in:
Shane M. Clements 2014-06-02 15:29:21 -06:00
commit 61ce01e849
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/extensions/ExtensionManager.as
View file

@ -266,7 +266,7 @@ public class ExtensionManager {
var msecsSinceLastResponse:uint = getTimer() - ext.lastPollResponseTime;
if (msecsSinceLastResponse > 500) indicator.setColorAndMsg(0xE00000, 'Cannot find helper app');
else if (ext.problem != '') indicator.setColorAndMsg(0xE0E000, ext.problem);
else indicator.setColorAndMsg(0x00C000, 'Okay');
else indicator.setColorAndMsg(0x00C000, ext.success);
}
else if(app.jsEnabled) {
var retval:Object = ExternalInterface.call('ScratchExtensions.getStatus', ext.name);
@ -339,11 +339,11 @@ public class ExtensionManager {
var id:int = ++ext.nextID; // assign a unique ID for this call
ext.busy.push(id);
activeThread.tmp = id;
activeThread.firstTime = false;
app.interp.doYield();
justStartedWait = true;
if(ext.port == 0) {
activeThread.firstTime = false;
if(app.jsEnabled)
ExternalInterface.call('ScratchExtensions.runAsync', ext.name, primOrVarName, args, id);
else
@ -531,6 +531,7 @@ public class ExtensionManager {
}
}
if ('_problem' == key) ext.problem = line.slice(9);
if ('_success' == key) ext.success = line.slice(9);
} else { // sensor value
var val:String = tokens[1];
var n:Number = Number(val);

1
src/extensions/ScratchExtension.as
View file

@ -58,6 +58,7 @@ public class ScratchExtension {
public var stateVars:Object = {};
public var lastPollResponseTime:int;
public var problem:String = '';
public var success:String = 'Okay';
public var nextID:int;
public var busy:Array = [];
public var waiting:Dictionary = new Dictionary(true);