cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix getting public servers while on favs tab

Browse Source
This commit is contained in:
Mauricio 2020-08-06 07:47:34 -04:00
parent 40eed16f22
commit 4c0e580e35
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainmenu.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from PyQt4 import QtGui, QtCore from PyQt4 import QtGui, QtCore
import socket, thread, time, random, traceback, hardware import socket, thread, threading, time, random, traceback, hardware
from os.path import exists from os.path import exists
AOpath = "base/" AOpath = "base/"
@ -167,7 +167,7 @@ class lobby(QtGui.QWidget):
thread.start_new_thread(self.connect_to_ms, ()) thread.start_new_thread(self.connect_to_ms, ())
def onGetServers(self, servers): def onGetServers(self, servers):
self.serverlist.clear() if self.tab == 0: self.serverlist.clear()
self.actual_serverlist = [] self.actual_serverlist = []
del servers[0] del servers[0]
del servers[-1] del servers[-1]
@ -186,7 +186,7 @@ class lobby(QtGui.QWidget):
ip = server[2] ip = server[2]
port = int(server[3]) port = int(server[3])
serveritem = QtGui.QListWidgetItem(name) serveritem = QtGui.QListWidgetItem(name)
self.serverlist.addItem(serveritem) if self.tab == 0: self.serverlist.addItem(serveritem)
self.actual_serverlist.append((ip, port, name, desc)) self.actual_serverlist.append((ip, port, name, desc))
def moveToGame(self, stuff): def moveToGame(self, stuff):
@ -561,3 +561,7 @@ class lobby(QtGui.QWidget):
name = network[1].decode("utf-8").replace('<dollar>', '$').replace('<percent>', '%').replace('<and>', '&').replace('<num>', '#').replace('<pound>', '#') name = network[1].decode("utf-8").replace('<dollar>', '$').replace('<percent>', '%').replace('<and>', '&').replace('<num>', '#').replace('<pound>', '#')
chatmsg = network[2].decode("utf-8").replace('<dollar>', '$').replace('<percent>', '%').replace('<and>', '&').replace('<num>', '#').replace('<pound>', '#') chatmsg = network[2].decode("utf-8").replace('<dollar>', '$').replace('<percent>', '%').replace('<and>', '&').replace('<num>', '#').replace('<pound>', '#')
self.gotOOCMsg.emit(name, chatmsg) self.gotOOCMsg.emit(name, chatmsg)
class ServerInfo(threading.Thread):
pass