Procházet zdrojové kódy

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

pull/114/head
Dan Ballard před 1 rokem
rodič
revize
f217533044
1 změnil soubory, kde provedl 8 přidání a 5 odebrání
  1. 8
    5
      app/app.go

+ 8
- 5
app/app.go Zobrazit soubor

@@ -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 {

Načítá se…
Zrušit
Uložit