Have ui.Go() return on main() return on Windows.

1 files changed, 17 insertions, 1 deletions

diff --git a/uitask_windows.go b/uitask_windows.go
index 33ab0ad..c8e94f2 100644
--- a/uitask_windows.go
+++ b/uitask_windows.go
@@ -29,6 +29,7 @@ type uiret struct {
 const (
 	_WM_APP = 0x8000 + iota
 	msgRequested
+	msgQuit
 )
 
 var (
@@ -49,7 +50,17 @@ func ui(main func()) error {
 	go msgloop(threadIDReq, msglooperrs)
 	threadID := <-threadIDReq
 
-	go main()
+	go func() {
+		main()
+		r1, _, err := _postThreadMessage.Call(
+			threadID,
+			msgQuit,
+			uintptr(0),
+			uintptr(0))
+		if r1 == 0 {		// failure
+			panic("error sending quit message to message loop: " + err.Error())		// TODO
+		}
+	}()
 
 	quit := false
 	for !quit {
@@ -123,6 +134,11 @@ func msgloop(threadID chan uintptr, errors chan error) {
 			}
 			continue
 		}
+		if msg.Message == msgQuit {
+			// does not return a value according to MSDN
+			_postQuitMessage.Call(0)
+			continue
+		}
 		_translateMessage.Call(uintptr(unsafe.Pointer(&msg)))
 		_dispatchMessage.Call(uintptr(unsafe.Pointer(&msg)))
 	}