github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 19:50:15 +08:00
Code Projects Activity

Fix wails dev (#1931)

Browse Source 
* Fix wails dev

* Pass wg as pointer to both goroutines in DevWebServer.Run

* Remove shutdown goroutine
This commit is contained in:
JulioDRF 2022-10-04 19:47:37 +00:00 committed by GitHub
parent 130f4cc36a
commit bd378b2e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
v2/internal/frontend/devserver/devserver.go
View File

@ -132,22 +132,18 @@ func (d *DevWebServer) Run(ctx context.Context) error {
}(d.server, d.logger) }(d.server, d.logger)
d.LogDebug("Serving DevServer at http://%s", devServerAddr) d.LogDebug("Serving DevServer at http://%s", devServerAddr)
defer func() {
err := d.server.Shutdown(context.Background())
if err != nil {
d.logger.Error(err.Error())
}
}()
} }
// Launch desktop app // Launch desktop app
err = d.desktopFrontend.Run(ctx) err = d.desktopFrontend.Run(ctx)
d.LogDebug("Starting shutdown")
return err return err
} }
func (d *DevWebServer) RunMainLoop() {
d.desktopFrontend.RunMainLoop()
}
func (d *DevWebServer) Quit() { func (d *DevWebServer) Quit() {
d.desktopFrontend.Quit() d.desktopFrontend.Quit()
} }
@ -186,6 +182,10 @@ func (d *DevWebServer) WindowSetTitle(title string) {
d.desktopFrontend.WindowSetTitle(title) d.desktopFrontend.WindowSetTitle(title)
} }
func (d *DevWebServer) WindowClose() {
d.desktopFrontend.WindowClose()
}
func (d *DevWebServer) WindowShow() { func (d *DevWebServer) WindowShow() {
d.desktopFrontend.WindowShow() d.desktopFrontend.WindowShow()
} }