fix

Menu/GameShell/10_Settings/About/about.go

@@ -414,8 +414,7 @@ func (self *AboutPlugin) Init(main_screen *UI.MainScreen) {
 func (self *AboutPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushPage(self.Page)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Airplane/plugin_init.go

@@ -30,8 +30,7 @@ func (self *AirplanePlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.AirplanePage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Bluetooth/plugin_init.go

@@ -121,8 +121,7 @@ func (self *BluetoothPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.BluetoothPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Brightness/plugin_init.go

@@ -33,8 +33,7 @@ func (self *BrightnessPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.BrightnessPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/ButtonsLayout/plugin_init.go

@@ -30,8 +30,7 @@ func (self *ButtonsLayoutPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.ButtonsLayoutPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/GateWay/plugin_init.go

@@ -30,8 +30,7 @@ func (self *GatewayPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.Page1st)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Languages/plugin_init.go

@@ -30,8 +30,7 @@ func (self *LanguagesPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.LanguagesPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Lima/plugin_init.go

@@ -30,8 +30,7 @@ func (self *LimaPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.GPUDriverPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/PowerOFF/plugin_init.go

@@ -30,8 +30,7 @@ func (self *PowerOFFPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.PowerOFFPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/PowerOptions/plugin_init.go

@@ -30,8 +30,7 @@ func (self *PowerOptionsPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.PowerOptionsPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Settings.go

@@ -307,8 +307,7 @@ func (self *SettingsPlugin) Init(main_screen *UI.MainScreen) {
 func (self *SettingsPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushPage(self.Page)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Sound/plugin_init.go

@@ -34,8 +34,7 @@ func (self *SoundPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.SoundPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Storage/plugin_init.go

@@ -29,8 +29,7 @@ func (self *StoragePlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.StoragePage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/TimeZone/plugin_init.go

@@ -30,8 +30,7 @@ func (self *TimeZonePlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushCurPage()
 		main_screen.SetCurPage(self.TimeZonePage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Update/plugin_init.go

@@ -20,8 +20,7 @@ func (self *UpdatePlugin) Init(main_screen *UI.MainScreen) {
 func (self *UpdatePlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
 		main_screen.PushPage(self.Page)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Wifi/plugin_init.go

@@ -49,10 +49,8 @@ func (self *WifiPlugin) Init(main_screen *UI.MainScreen) {
 
 func (self *WifiPlugin) Run(main_screen *UI.MainScreen) {
 	if main_screen != nil {
-		main_screen.PushCurPage()
-		main_screen.SetCurPage(self.ScanPage)
-		main_screen.Draw()
-		main_screen.SwapAndShow()
+		main_screen.PushPage(self.ScanPage)
+		main_screen.Refresh()
 	}
 }
 

Menu/GameShell/10_Settings/Wifi/wifi.go

@@ -372,7 +372,6 @@ type WifiList struct {
 	Connecting   bool
 	Scanning     bool
 
-	ShowingMessageBox bool
 	MsgBox            *WifiListMessageBox
 	ConnectTry        int
 
@@ -402,14 +401,7 @@ func NewWifiList() *WifiList {
 
 func (self *WifiList) ShowBox(msg string) {
 	self.MsgBox.Text = msg
-	self.ShowingMessageBox = true
-	self.Screen.ShowMsg(msg,0)
-}
-
-func (self *WifiList) HideBox() {
-	self.Draw()
-	self.ShowingMessageBox = false
-	self.Screen.SwapAndShow()
+	self.Screen.ShowMsg(msg,1)
 }
 
 func (self *WifiList) GenNetworkList() {
@@ -452,7 +444,7 @@ func (self *WifiList) GenNetworkList() {
 			li_idx++
 		}
 	}
-
+	
 	self.WifiScanFinished()
 
 	self.PsIndex = 0
@@ -495,9 +487,7 @@ func (self *WifiList) WifiScanFinished() {
 	self.ResetPageSelector()
 
 	self.Scanning = false
-	self.HideBox()
 
-	self.BlockingUI = false
 	fmt.Println("dbus says scan finished")
 
 }
@@ -508,8 +498,7 @@ func (self *WifiList) WifiScanStarted() {
 	}
 
 	self.Scanning = true
-	self.ShowBox("Wifi scanning...")
-	self.BlockingUI = true
+	self.ShowBox("Wifi scanning")
 	fmt.Println("dbus says start scan")
 }
 
@@ -602,7 +591,7 @@ func (self *WifiList) ConfigWireless(password string) {
 	ssid := self.MyList[self.PsIndex].Essid
 	fmt.Println(ssid)
 	fmt.Println(password)
-	self.ShowBox("Connecting...")
+	self.ShowBox("Connecting")
 
 	self.Connecting = true
 	cli := fmt.Sprintf("sudo nmcli dev wifi connect %s password \"%s\"", ssid, password)
@@ -674,7 +663,6 @@ func (self *WifiList) ScrollDown() {
 }
 
 func (self *WifiList) AbortedAndReturnToUpLevel() {
-	self.HideBox()
 	self.Screen.FootBar.ResetNavText()
 	self.ReturnToUpLevelPage()
 
@@ -739,6 +727,7 @@ func (self *WifiList) KeyDown(ev *event.Event) {
 
 	if ev.Data["Key"] == UI.CurKeys["X"] {
 		self.Rescan(false)
+		self.Screen.Refresh()
 	}
 
 	if ev.Data["Key"] == UI.CurKeys["Y"] {