Merge branch 'develop'

This commit is contained in:
Lea Anthony
2021-04-17 08:28:59 +10:00
12 changed files with 59 additions and 20 deletions

View File

@@ -111,11 +111,14 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
}
// SignalManager.OnExit(w.Exit)
// Set colour
err := w.SetColour(config.GetColour())
if err != nil {
return err
color := config.GetColour()
if color != "" {
err := w.SetColour(color)
if err != nil {
return err
}
}
w.log.Info("Initialised")