Fixed issuing in the new system. Now to figure out why it stalls...
This commit is contained in:
parent
e73e7ab733
commit
627abfd593
|
@ -15,20 +15,24 @@ func Go() error {
|
|||
if err := uiinit(); err != nil {
|
||||
return err
|
||||
}
|
||||
go uiissueloop()
|
||||
uimsgloop()
|
||||
return nil
|
||||
}
|
||||
|
||||
// To ensure that Do() and Stop() only do things after Go() has been called, this channel accepts the requests to issue. The issuing is done by uiissueloop() below.
|
||||
var issuer = make(chan func())
|
||||
|
||||
// Do performs f on the main loop, as if it were an event handler.
|
||||
// It waits for f to execute before returning.
|
||||
// Do cannot be called within event handlers or within Do itself.
|
||||
func Do(f func()) {
|
||||
done := make(chan struct{})
|
||||
defer close(done)
|
||||
issue(func() {
|
||||
issuer <- func() {
|
||||
f()
|
||||
done <- struct{}{}
|
||||
})
|
||||
}
|
||||
<-done
|
||||
}
|
||||
|
||||
|
@ -38,7 +42,13 @@ func Do(f func()) {
|
|||
// Stop will not have an effect until any event handlers or dialog boxes presently active return.
|
||||
// (TODO make sure this is the case for dialog boxes)
|
||||
func Stop() {
|
||||
issue(uistop)
|
||||
issuer <- uistop
|
||||
}
|
||||
|
||||
func uiissueloop() {
|
||||
for f := range issuer {
|
||||
issue(f)
|
||||
}
|
||||
}
|
||||
|
||||
type event struct {
|
||||
|
|
Loading…
Reference in New Issue