clockworkpi/LauncherGoDev
1
0
Fork 0
mirror of https://github.com/clockworkpi/LauncherGoDev.git synced 2025-12-12 16:08:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
cuu 2018-12-08 13:28:30 +08:00
parent 709fe20f49
commit a1a32ba626
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Menu/GameShell/10_Settings/Wifi/plugin_init.go
View File

@ -1,6 +1,7 @@
package main package main
import ( import (
gotime "time"
/* /*
"github.com/veandco/go-sdl2/ttf" "github.com/veandco/go-sdl2/ttf"
@ -36,19 +37,24 @@ func (self *WifiPlugin) Init( main_screen *UI.MainScreen ) {
self.ScanPage.Init() self.ScanPage.Init()
if self.ScanPage.Daemon != nil { go func() {
self.ScanPage.Daemon.EnableSignal("StatusChanged") gotime.Sleep(2000 * gotime.Millisecond)
self.ScanPage.Daemon.EnableSignal("ConnectResultsSent")
self.ScanPage.Wireless.EnableSignal("SendStartScanSignal")
self.ScanPage.Wireless.EnableSignal("SendEndScanSignal")
self.ScanPage.Daemon.SigFuncs["StatusChanged"] = self.ScanPage.DbusDaemonStatusChangedSig if self.ScanPage.Daemon != nil {
self.ScanPage.Daemon.SigFuncs["ConnectResultSent"] = self.ScanPage.DbusConnectResultsSent
self.ScanPage.Wireless.SigFuncs["SendStartScanSignal"] = self.ScanPage.WifiDbusScanStarted self.ScanPage.Daemon.EnableSignal("StatusChanged")
self.ScanPage.Wireless.SigFuncs["SendEndScanSignal"] = self.ScanPage.WifiDbusScanFinishedSig self.ScanPage.Daemon.EnableSignal("ConnectResultsSent")
self.ScanPage.Wireless.EnableSignal("SendStartScanSignal")
self.ScanPage.Wireless.EnableSignal("SendEndScanSignal")
self.ScanPage.Daemon.SigFuncs["StatusChanged"] = self.ScanPage.DbusDaemonStatusChangedSig
self.ScanPage.Daemon.SigFuncs["ConnectResultSent"] = self.ScanPage.DbusConnectResultsSent
self.ScanPage.Wireless.SigFuncs["SendStartScanSignal"] = self.ScanPage.WifiDbusScanStarted
self.ScanPage.Wireless.SigFuncs["SendEndScanSignal"] = self.ScanPage.WifiDbusScanFinishedSig
}
}()
}
} }
func (self *WifiPlugin) Run( main_screen *UI.MainScreen ) { func (self *WifiPlugin) Run( main_screen *UI.MainScreen ) {

13
main.go
View File

@ -10,6 +10,7 @@ import (
"strings" "strings"
"runtime" "runtime"
"path/filepath" "path/filepath"
"os/exec"
gotime "time" gotime "time"
"github.com/veandco/go-sdl2/sdl" "github.com/veandco/go-sdl2/sdl"
@ -289,8 +290,16 @@ func run() int {
exec_app_cmd += ev.Data["Msg"] exec_app_cmd += ev.Data["Msg"]
exec_app_cmd +="; sync & cd "+UI.GetExePath()+"; "+os.Args[0] exec_app_cmd +="; sync & cd "+UI.GetExePath()+"; "+os.Args[0]
fmt.Println(exec_app_cmd) fmt.Println(exec_app_cmd)
cmd := exec.Command("/bin/sh","-c",exec_app_cmd)
err := cmd.Start()
if err != nil {
fmt.Println(err)
}
err = cmd.Process.Release()
if err != nil {
fmt.Println(err)
}
os.Exit(0)
} }

8
sysgo/DBUS/dbus.go
View File

@ -214,9 +214,11 @@ func (self *DBus) ListenSignal() {
var DBusHandler *DBus //global var DBusHandler *DBus //global
func init() { func init() {
DBusHandler = NewDBus() if DBusHandler == nil {
DBusHandler.Init() DBusHandler = NewDBus()
DBusHandler.Init()
go DBusHandler.ListenSignal() go DBusHandler.ListenSignal()
}
} }