fixed merge issue

This commit is contained in:
obscuren
2015-05-06 22:54:21 +02:00
7 changed files with 317 additions and 39 deletions

View File

@ -104,8 +104,8 @@ func (ui *UiLib) Connect(button qml.Object) {
}
func (ui *UiLib) ConnectToPeer(nodeURL string) {
if err := ui.eth.SuggestPeer(nodeURL); err != nil {
guilogger.Infoln("SuggestPeer error: " + err.Error())
if err := ui.eth.AddPeer(nodeURL); err != nil {
guilogger.Infoln("AddPeer error: " + err.Error())
}
}