Merge branch 'fix'

renpy/loadsave.py

@@ -886,6 +886,15 @@ def cycle_saves(name, count):
 unknown = renpy.object.Sentinel("unknown")
 
 
+def wrap_json(d):
+    if isinstance(d, list):
+        return [ wrap_json(i) for i in d ]
+    if isinstance(d, dict):
+        return renpy.revertable.RevertableDict({ k : wrap_json(v) for k, v in d.items() })
+    else:
+        return d
+
+
 class Cache(object):
     """
     This represents cached information about a save slot.
@@ -921,7 +930,7 @@ class Cache(object):
         if rv is unknown:
             rv = self.json = location.json(self.slotname)
 
-        return rv
+        return wrap_json(rv)
 
     def get_screenshot(self):
 

renpy/text/font.py

@@ -765,6 +765,7 @@ def free_memory():
 
     scaled_image_fonts.clear()
     font_cache.clear()
+    face_cache.clear()
 
 
 def load_fonts():

renpy/text/ftfont.pyx

@@ -188,6 +188,10 @@ cdef class FTFace:
 
         public object fn
 
+    def __dealloc__(self):
+        if self.face != NULL:
+            FT_Done_Face(self.face)
+
     def __init__(self, f, index, fn):
 
         cdef int error

renpy/text/hbfont.pyx

@@ -369,6 +369,8 @@ cdef class HBFace:
         if self.mm_var:
             FT_Done_MM_Var(library, self.mm_var)
 
+        FT_Done_Face(self.face)
+
     def __init__(self, f, index, fn):
 
         cdef int error