Merge branch 'master' of https://github.com/syj2010syj/w3x2lni

sumneko · Dec 23, 2016 · fb28849 · fb28849
2 parents 5a0a4eb + 2a6f790
commit fb28849
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/script/gui/backend.lua b/script/gui/backend.lua
@@ -145,6 +145,9 @@ end
 
 function srv.async_popen(commandline)
 	local process, out_rd, err_rd, in_wr = srv.popen(commandline)
+	if not process then
+		return
+	end
 	in_wr:close()
 	return setmetatable({
 		process = process,

diff --git a/script/gui/main.lua b/script/gui/main.lua
@@ -305,7 +305,7 @@ local function window_convert(canvas)
 	else
 		if canvas:button('开始') then
 			canvas:progress(0, 100)
-			backend = srv.async_popen(('"%s" -backend "%s"'):format(arg[0], mappath:string()))
+			backend = srv.async_popen(('"%s" -backend "%s"'):format(fs.get(fs.DIR_EXE):string(), mappath:string()))
 			srv.message = '正在初始化...'
 			srv.progress = nil
 			srv.report = {}