Handle server connection in minimized start
This commit is contained in:
+1
-1
@@ -429,7 +429,7 @@ func (a *App) SetupWindowsSMTC(hwnd uintptr) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) LoginToDefaultServer(string) error {
|
func (a *App) LoginToDefaultServer() error {
|
||||||
serverCfg := a.ServerManager.GetDefaultServer()
|
serverCfg := a.ServerManager.GetDefaultServer()
|
||||||
if serverCfg == nil {
|
if serverCfg == nil {
|
||||||
return ErrNoServers
|
return ErrNoServers
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ func main() {
|
|||||||
defaultServer := myApp.ServerManager.GetDefaultServer()
|
defaultServer := myApp.ServerManager.GetDefaultServer()
|
||||||
if defaultServer == nil {
|
if defaultServer == nil {
|
||||||
mainWindow.Controller.PromptForFirstServer()
|
mainWindow.Controller.PromptForFirstServer()
|
||||||
} else {
|
} else if !*backend.FlagStartMinimized { // If the minimized start flag was passed, the connection is already established.
|
||||||
mainWindow.Controller.DoConnectToServerWorkflow(defaultServer)
|
mainWindow.Controller.DoConnectToServerWorkflow(defaultServer)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,6 +104,10 @@ func main() {
|
|||||||
fyneApp.Lifecycle().SetOnEnteredForeground(windowStartupTasks)
|
fyneApp.Lifecycle().SetOnEnteredForeground(windowStartupTasks)
|
||||||
|
|
||||||
if *backend.FlagStartMinimized {
|
if *backend.FlagStartMinimized {
|
||||||
|
if err = myApp.LoginToDefaultServer(); err != nil {
|
||||||
|
log.Fatalf("failed to connect to server: %v", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
fyneApp.Run()
|
fyneApp.Run()
|
||||||
} else {
|
} else {
|
||||||
mainWindow.ShowAndRun()
|
mainWindow.ShowAndRun()
|
||||||
|
|||||||
Reference in New Issue
Block a user