awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'async-spawn-optional-callbacks' of https://github.com/actionless/awesome

This commit is contained in:
Uli Schlachter 2016-01-17 16:00:39 +01:00
parent ab5f9d3d74 7546c236db
commit fd8d35cb12
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/awful/spawn.lua
View File

@ -123,8 +123,10 @@ function spawn.with_line_callback(cmd, callbacks)
done_before = true done_before = true
return return
end end
if done_callback then
done_callback() done_callback()
end end
end
if have_stdout then if have_stdout then
spawn.read_lines(Gio.UnixInputStream.new(stdout, true), spawn.read_lines(Gio.UnixInputStream.new(stdout, true),
stdout_callback, step_done, true) stdout_callback, step_done, true)

2
spawn.c
View File

@ -402,7 +402,7 @@ luaA_spawn(lua_State *L)
return_stdout = luaA_checkboolean(L, 4); return_stdout = luaA_checkboolean(L, 4);
if(lua_gettop(L) >= 5) if(lua_gettop(L) >= 5)
return_stderr = luaA_checkboolean(L, 5); return_stderr = luaA_checkboolean(L, 5);
if(lua_gettop(L) >= 6) if (!lua_isnoneornil(L, 6))
{ {
luaA_checkfunction(L, 6); luaA_checkfunction(L, 6);
flags |= G_SPAWN_DO_NOT_REAP_CHILD; flags |= G_SPAWN_DO_NOT_REAP_CHILD;