diff --git a/gameview.py b/gameview.py index ae1bf53..53305d6 100644 --- a/gameview.py +++ b/gameview.py @@ -331,19 +331,17 @@ class AOCharMovie(QtGui.QLabel): imgPath, ext = self.findSprite(pChar, pEmote, emotePrefix) if not imgPath: - if self.prevGifPath: - imgPath = self.prevGifPath + print "[debug] Sprite not found:", pChar, pEmote, emotePrefix + if exists(placeholderPath): + imgPath = placeholderPath else: - if exists(placeholderPath): - imgPath = placeholderPath - print "[debug] Sprite not found:", pChar, pEmote, emotePrefix - else: - imgPath = "placeholder.png" + imgPath = "placeholder.png" # if ini.read_ini_bool("AO2XP.ini", "General", "download characters"): # url = "base/characters/" + pChar.lower() + "/" + emotePrefix + pEmote.lower() + ".gif" # url = url.replace(" ", "%20") # thread.start_new_thread(downloadThread, (url, gifPath)) - else: + + if imgPath: self.prevGifPath = imgPath if ext == ".apng": diff --git a/mainmenu.py b/mainmenu.py index 931998e..f708800 100644 --- a/mainmenu.py +++ b/mainmenu.py @@ -630,4 +630,5 @@ class AOServerInfo(QtCore.QThread): self.setConnectProgress.emit('Finishing...') self.tcp.send('RD#%') print '[client]', 'Received songs (%d)' % len(musicList) - + + self.msleep(5)