Only lock event handling

[micro.git] / cmd / micro / micro.go

diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index 62b3290cac7a9e00812ba8df73cb5f811178897d..a4d22b70e5db8f95e194c532e0499c33957b49cd 100644 (file)
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -17,6 +17,7 @@ import (
        "github.com/zyedidia/micro/v2/internal/action"
        "github.com/zyedidia/micro/v2/internal/buffer"
        "github.com/zyedidia/micro/v2/internal/config"
+       ulua "github.com/zyedidia/micro/v2/internal/lua"
        "github.com/zyedidia/micro/v2/internal/screen"
        "github.com/zyedidia/micro/v2/internal/shell"
        "github.com/zyedidia/micro/v2/internal/util"
@@ -377,11 +378,15 @@ func DoEvent() {
        select {
        case f := <-shell.Jobs:
                // If a new job has finished while running in the background we should execute the callback
+               ulua.Lock.Lock()
                f.Function(f.Output, f.Args)
+               ulua.Lock.Unlock()
        case <-config.Autosave:
+               ulua.Lock.Lock()
                for _, b := range buffer.OpenBuffers {
                        b.Save()
                }
+               ulua.Lock.Unlock()
        case <-shell.CloseTerms:
        case event = <-events:
        case <-screen.DrawChan():
@@ -390,9 +395,11 @@ func DoEvent() {
                }
        }
 
+       ulua.Lock.Lock()
        if action.InfoBar.HasPrompt {
                action.InfoBar.HandleEvent(event)
        } else {
                action.Tabs.HandleEvent(event)
        }
+       ulua.Lock.Unlock()
 }