From 0efebb61352499a7338b8365dd4c59e6848ddaf8 Mon Sep 17 00:00:00 2001
From: cidoku <git@cidoku.net>
Date: Thu, 13 Feb 2025 21:11:30 -0300
Subject: [PATCH] dirty fix to prevent placeholders from showing up when frames
 aren't present (like web)

---
 gameview.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gameview.py b/gameview.py
index 6c9af00..69a03cf 100644
--- a/gameview.py
+++ b/gameview.py
@@ -233,6 +233,8 @@ class AOCharMovie(QtGui.QLabel):
         self.preanim_timer.timeout.connect(self.timer_done)
         self.pillow_timer.timeout.connect(self.pillow_frame_change)
         self.m_movie.frameChanged.connect(self.frame_change)
+        
+        self.prev_gif_path = ""
 
     def move(self, x, y, screenShaking=False):
         if not screenShaking:
@@ -307,6 +309,11 @@ class AOCharMovie(QtGui.QLabel):
                         else:
                             gif_path = ""
                         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:
             self.m_movie.stop()
@@ -2588,7 +2595,7 @@ class gui(QtGui.QWidget):
             self.ooclog.append(msg)
 
         for song in musiclist:
-            song = song.replace("<and>","&")
+            song = song.replace("<and>","&").decode('utf-8')
             songitem = QtGui.QListWidgetItem()
             songitem.setText(song)
             if exists(AOpath + 'sounds/music/' + song):