Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit bd8d199

Browse files
Merge pull request #1674 from livecode/bugfix-20102
[[ Bug 20102 ]] Don't short-cut 'is changed' tutorial steps
2 parents 3802dcd + daeb473 commit bd8d199

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

Toolset/palettes/tutorial/revtutorial.livecodescript

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2020,7 +2020,7 @@ on revTutorialContinue pBack
20202020
if sSteps[sStepName]["actions"]["wait"] is not empty then
20212021
# Add guide in case wait is 'fits guide'
20222022
revTutorialExecuteAction sSteps[sStepName]["actions"]["add guide"]
2023-
if revTutorialCheckWaitCondition(sSteps[sStepName]["actions"]["wait"]) then
2023+
if revTutorialCheckWaitCondition(sSteps[sStepName]["actions"]["wait"], true) then
20242024
put false into sDontShow
20252025
next repeat
20262026
end if
@@ -2338,7 +2338,7 @@ end revTutorialReturnFromInterlude
23382338
on revTutorialDoWait pActionData
23392339
put empty into sWait
23402340
// Check to see if wait condition is immediately satisfied
2341-
if revTutorialCheckWaitCondition(pActionData) then
2341+
if revTutorialCheckWaitCondition(pActionData, true) then
23422342
exit revTutorialDoWait
23432343
end if
23442344

@@ -2392,7 +2392,7 @@ on revTutorialDoWait pActionData
23922392
end switch
23932393
end revTutorialDoWait
23942394

2395-
function revTutorialCheckWaitCondition pActionData
2395+
function revTutorialCheckWaitCondition pActionData, pBeforeDisplay
23962396
# Deal with non-object wait conditions
23972397
switch pActionData["wait condition"]
23982398
case "there is a palette"
@@ -2409,6 +2409,12 @@ function revTutorialCheckWaitCondition pActionData
24092409

24102410
switch pActionData["wait condition"]
24112411
case "property"
2412+
# If we are waiting for the property to be 'changed' then don't try and
2413+
# shortcut the step
2414+
if pBeforeDisplay and pActionData["is not"] then
2415+
break
2416+
end if
2417+
24122418
local tValue
24132419
# If the step specified a value then we want to compare with this instead
24142420
# of the string "value"

notes/bugfix-20102.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Don't shortcut 'is changed' property steps

0 commit comments

Comments
 (0)