oreolek/steed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

goto form exit

Browse source
This commit is contained in:
p.kosyh 2010-06-23 17:25:23 +00:00
parent 22c533ea42
commit 0f538b8238
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stead/goto.lua
View file

@ -27,7 +27,7 @@ go = function (self, where, back)
error ("Do not use goto from left/entered action! Use exit/enter action instead:" .. self.where);
end
local v, r;
local v, r, jump;
if not isVroom(ref(where)) and not stead.in_exit_call then
stead.in_exit_call = true -- to break recurse
@ -36,6 +36,10 @@ go = function (self, where, back)
if r == false then
return v, ret(r)
end
if self.where ~= was then
where = deref(self.where) -- jump
jump = true
end
end
local res = v;
@ -45,7 +49,7 @@ go = function (self, where, back)
self.where = deref(where);
end
if not back or not isDialog(ref(was)) or isDialog(ref(where)) then
if not jump and (not back or not isDialog(ref(was)) or isDialog(ref(where))) then
v, r = call(ref(where), 'enter', deref(was));
if r == false then
self.where = was;