apps/urtrator
Archived
2
0
Fork 0
Code Issues 22 Pull Requests Packages Projects Releases 8 Wiki Activity

Possibly solved crashes on GTK's actions.

Browse Source
This commit is contained in:
Stanislav Nikitin 2016-11-02 22:28:15 +05:00
parent e487b8521c
commit b1d38bbdcf
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/mainwindow.go
View File

@ -308,7 +308,6 @@ func (m *MainWindow) hideOfflineFavoriteServers() {
func (m *MainWindow) loadAllServers(data map[string]string) { func (m *MainWindow) loadAllServers(data map[string]string) {
fmt.Println("Loading all servers...") fmt.Println("Loading all servers...")
// ToDo: do it without clearing.
for _, server := range ctx.Cache.Servers { for _, server := range ctx.Cache.Servers {
iter := new(gtk.TreeIter) iter := new(gtk.TreeIter)
ping, _ := strconv.Atoi(server.Server.Ping) ping, _ := strconv.Atoi(server.Server.Ping)
@ -321,7 +320,7 @@ func (m *MainWindow) loadAllServers(data map[string]string) {
} }
if m.all_servers_hide_offline.GetActive() && (server.Server.Players == "" && server.Server.Maxplayers == "" || ping > 9000) { if m.all_servers_hide_offline.GetActive() && (server.Server.Players == "" && server.Server.Maxplayers == "" || ping > 9000) {
if server.AllServersIterInList { if server.AllServersIterInList && server.AllServersIterSet {
m.all_servers_store.Remove(iter) m.all_servers_store.Remove(iter)
server.AllServersIterInList = false server.AllServersIterInList = false
} }

6
ui/mainwindow_init.go
View File

@ -11,6 +11,7 @@ import (
"github.com/pztrn/urtrator/common" "github.com/pztrn/urtrator/common"
// Other // Other
"github.com/mattn/go-gtk/gdk"
"github.com/mattn/go-gtk/gdkpixbuf" "github.com/mattn/go-gtk/gdkpixbuf"
"github.com/mattn/go-gtk/glib" "github.com/mattn/go-gtk/glib"
"github.com/mattn/go-gtk/gtk" "github.com/mattn/go-gtk/gtk"
@ -18,6 +19,10 @@ import (
// Main window initialization. // Main window initialization.
func (m *MainWindow) Initialize() { func (m *MainWindow) Initialize() {
gdk.ThreadsInit()
gdk.ThreadsEnter()
gtk.Init(nil) gtk.Init(nil)
m.initializeStorages() m.initializeStorages()
@ -165,6 +170,7 @@ func (m *MainWindow) Initialize() {
ctx.Eventer.LaunchEvent("setToolbarLabelText", map[string]string{"text": "URTrator is ready."}) ctx.Eventer.LaunchEvent("setToolbarLabelText", map[string]string{"text": "URTrator is ready."})
gtk.Main() gtk.Main()
gdk.ThreadsLeave()
} }
// Events initialization. // Events initialization.