Merge branch 'master' of git://estrelaeditor.git.sourceforge.net/gitroot/estrelaeditor/estrelaeditor

This commit is contained in:
Paul Kulchenko
2012-08-28 22:59:47 -07:00
8 changed files with 14248 additions and 12648 deletions

View File

@@ -257,8 +257,7 @@ debugger.listen = function()
reSetBreakpoints()
if (options.run) then
local file, line = debugger.handle("run")
activateDocument(file, line)
-- do nothing here
elseif (debugger.scratchpad) then
debugger.scratchpad.updated = true
else
@@ -316,6 +315,11 @@ debugger.listen = function()
DisplayOutput(("Debugging session started in '%s'.\n")
:format(debugger.basedir))
if (options.run) then
local file, line = debugger.handle("run")
activateDocument(file, line)
end
end)
debugger.listening = true
end