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

Fixed favorite servers updating crash when nothing was selected on Servers tab.

Browse Source
This commit is contained in:
Stanislav Nikitin
2016-10-08 00:01:20 +05:00
parent 3fc873ff2b
commit ac57e6376c
2 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/mainwindow_helpers.go
View File

@@ -21,22 +21,24 @@ func (m *MainWindow) getGameModeName(name string) string {
func (m *MainWindow) getIpFromServersList(current_tab string) string {
// Getting server's address from list.
// Assuming that we're on "Servers" tab by default.
sel := m.all_servers.GetSelection()
model := m.all_servers.GetModel()
if strings.Contains(current_tab, "Favorites") {
sel = m.fav_servers.GetSelection()
model = m.fav_servers.GetModel()
}
iter := new(gtk.TreeIter)
_ = sel.GetSelected(iter)
// Getting server address.
var srv_addr string
srv_addr_gval := glib.ValueFromNative(srv_addr)
model.GetValue(iter, m.column_pos["Servers"]["IP"], srv_addr_gval)
if strings.Contains(current_tab, "Favorites") {
// Getting server's address from list.
sel = m.fav_servers.GetSelection()
model = m.fav_servers.GetModel()
iter := new(gtk.TreeIter)
_ = sel.GetSelected(iter)
if strings.Contains(current_tab, "Servers") {
model.GetValue(iter, m.column_pos["Servers"]["IP"], srv_addr_gval)
} else if strings.Contains(current_tab, "Favorites") {
model.GetValue(iter, m.column_pos["Favorites"]["IP"], srv_addr_gval)
}
server_address := srv_addr_gval.GetString()