Merge branch 'clifix' of cwtch.im/cwtch into master

Este commit está contenido en:
Dan Ballard 2018-08-05 17:23:19 +00:00 cometido por Gogs
commit f217533044
Se han modificado 1 ficheros con 8 adiciones y 5 borrados

Ver fichero

@ -70,12 +70,15 @@ func (app *Application) startTor(torPath string) error {
// SetProfile loads an existing profile from the given filename.
func (app *Application) SetProfile(filename string, password string) error {
profile, err := peer.LoadCwtchPeer(path.Join(app.directory, filename), password)
if err != nil {
return err
if app.Peer == nil {
profile, err := peer.LoadCwtchPeer(path.Join(app.directory, filename), password)
if err != nil {
return err
}
app.Peer = profile
return app.startPeer()
}
app.Peer = profile
return app.startPeer()
return errors.New("profile is already loaded, to load a different profile you will need to restart the application")
}
func (app *Application) startPeer() error {