pogmommy/gonetworkmanager
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AddAndActivateWirelessConnection: removed unnecessary recover

Browse source
This commit is contained in:
Peter Hommel 2019-05-13 14:12:35 +02:00
parent f42ba34c0a
commit 54e6cf98e2
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
NetworkManager.go
View file

@ -2,8 +2,6 @@ package gonetworkmanager
import ( import (
"encoding/json" "encoding/json"
"errors"
"fmt"
"github.com/godbus/dbus" "github.com/godbus/dbus"
) )
@ -109,12 +107,7 @@ func (n *networkManager) ActivateWirelessConnection(c Connection, d Device, ap A
func (n *networkManager) AddAndActivateWirelessConnection(connection map[string]map[string]interface{}, d Device, ap AccessPoint) (ac ActiveConnection, err error) { func (n *networkManager) AddAndActivateWirelessConnection(connection map[string]map[string]interface{}, d Device, ap AccessPoint) (ac ActiveConnection, err error) {
var opath1 dbus.ObjectPath var opath1 dbus.ObjectPath
var opath2 dbus.ObjectPath var opath2 dbus.ObjectPath
defer func() {
if r := recover(); r != nil {
ap = nil
err = errors.New("panic in " + NetworkManagerAddAndActivateConnection + ": " + fmt.Sprint(r))
}
}()
err = n.callError2(&opath1, &opath2, NetworkManagerAddAndActivateConnection, connection, d.GetPath(), ap.GetPath()) err = n.callError2(&opath1, &opath2, NetworkManagerAddAndActivateConnection, connection, d.GetPath(), ap.GetPath())
if err != nil { if err != nil {
return return