Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6932/wxLua/samples
Modified Files:
editor.wx.lua
Log Message:
try to fix crashing in MSW while trying to kill debuggee process
Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** editor.wx.lua 10 Dec 2006 23:28:12 -0000 1.38
--- editor.wx.lua 11 Dec 2006 07:03:30 -0000 1.39
***************
*** 1656,1663 ****
-- FIXME why would you want to run all the notebook pages?
--for id, document in pairs(openDocuments) do
! -- local editor = document.editor
! local editor = GetEditor()
! local editorText = editor:GetText()
local document = openDocuments[editor:GetId()]
local filePath = MakeDebugFileName(editor, document.filePath)
ok = debuggerServer:Run(filePath, editorText)
--- 1656,1663 ----
-- FIXME why would you want to run all the notebook pages?
--for id, document in pairs(openDocuments) do
! local editor = GetEditor() -- MUST use document.editor userdata!
local document = openDocuments[editor:GetId()]
+ local editor = document.editor
+ local editorText = editor:GetText()
local filePath = MakeDebugFileName(editor, document.filePath)
ok = debuggerServer:Run(filePath, editorText)
***************
*** 1703,1707 ****
local line = event:GetLineNumber()
local eventFileName = event:GetFileName()
! if string.sub(eventFileName, 1, 1) == '@' then
eventFileName = string.sub(eventFileName, 2, -1)
if wx.wxIsAbsolutePath(eventFileName) == false then
--- 1703,1708 ----
local line = event:GetLineNumber()
local eventFileName = event:GetFileName()
!
! if string.sub(eventFileName, 1, 1) == '@' then -- FIXME what is this?
eventFileName = string.sub(eventFileName, 2, -1)
if wx.wxIsAbsolutePath(eventFileName) == false then
***************
*** 2042,2046 ****
debugger_connected = false
if debuggerServer then
! debuggerServer:Reset()
debuggerServer:Delete()
debuggerServer = nil
--- 2043,2048 ----
debugger_connected = false
if debuggerServer then
! --debuggerServer:Reset()
! debuggerServer:KillDebuggee()
debuggerServer:Delete()
debuggerServer = nil
|
