mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-11-13 19:04:54 +01:00
When yielding after an async command, call the rest deferred
This might help fix the crash bug?
This commit is contained in:
parent
38faac5485
commit
a893cba9d3
2 changed files with 5 additions and 3 deletions
|
@ -1,9 +1,9 @@
|
|||
conflict
|
||||
init
|
||||
checkout-commit
|
||||
branching
|
||||
merge
|
||||
branches
|
||||
conflict
|
||||
pull-push
|
||||
rebase
|
||||
reorder
|
||||
|
|
|
@ -78,7 +78,9 @@ func send_command(command):
|
|||
|
||||
var cmd = repository.shell.run_async(command, false)
|
||||
yield(cmd, "done")
|
||||
|
||||
call_deferred("command_done", cmd)
|
||||
|
||||
func command_done(cmd):
|
||||
if cmd.exit_code == 0:
|
||||
$OkSound.pitch_scale = rand_range(0.8, 1.2)
|
||||
$OkSound.play()
|
||||
|
@ -89,7 +91,7 @@ func send_command(command):
|
|||
input.editable = true
|
||||
|
||||
if cmd.output.length() <= 1000:
|
||||
output.text = output.text + "$ " + command + "\n" + cmd.output
|
||||
output.text = output.text + "$ " + cmd.command + "\n" + cmd.output
|
||||
else:
|
||||
$Pager/Text.text = cmd.output
|
||||
$Pager.popup()
|
||||
|
|
Loading…
Reference in a new issue