dirty fix to prevent placeholders from showing up when frames aren't present (like web)
This commit is contained in:
parent
961990b42a
commit
0efebb6135
@ -234,6 +234,8 @@ class AOCharMovie(QtGui.QLabel):
|
|||||||
self.pillow_timer.timeout.connect(self.pillow_frame_change)
|
self.pillow_timer.timeout.connect(self.pillow_frame_change)
|
||||||
self.m_movie.frameChanged.connect(self.frame_change)
|
self.m_movie.frameChanged.connect(self.frame_change)
|
||||||
|
|
||||||
|
self.prev_gif_path = ""
|
||||||
|
|
||||||
def move(self, x, y, screenShaking=False):
|
def move(self, x, y, screenShaking=False):
|
||||||
if not screenShaking:
|
if not screenShaking:
|
||||||
self.xx = x
|
self.xx = x
|
||||||
@ -308,6 +310,11 @@ class AOCharMovie(QtGui.QLabel):
|
|||||||
gif_path = ""
|
gif_path = ""
|
||||||
self.use_pillow = 0
|
self.use_pillow = 0
|
||||||
|
|
||||||
|
if gif_path == placeholder_path or gif_path == "":
|
||||||
|
gif_path = self.prev_gif_path
|
||||||
|
else:
|
||||||
|
self.prev_gif_path = gif_path
|
||||||
|
|
||||||
if not self.use_pillow:
|
if not self.use_pillow:
|
||||||
self.m_movie.stop()
|
self.m_movie.stop()
|
||||||
self.m_movie.setFileName(gif_path)
|
self.m_movie.setFileName(gif_path)
|
||||||
@ -2588,7 +2595,7 @@ class gui(QtGui.QWidget):
|
|||||||
self.ooclog.append(msg)
|
self.ooclog.append(msg)
|
||||||
|
|
||||||
for song in musiclist:
|
for song in musiclist:
|
||||||
song = song.replace("<and>","&")
|
song = song.replace("<and>","&").decode('utf-8')
|
||||||
songitem = QtGui.QListWidgetItem()
|
songitem = QtGui.QListWidgetItem()
|
||||||
songitem.setText(song)
|
songitem.setText(song)
|
||||||
if exists(AOpath + 'sounds/music/' + song):
|
if exists(AOpath + 'sounds/music/' + song):
|
||||||
|
Loading…
Reference in New Issue
Block a user