Resolve conflict, part 2.

1 files changed, 1 insertions, 1 deletions

diff --git a/mupdf/pdf_font.c b/mupdf/pdf_font.c
index fab3d4ca..e6234c14 100644
--- a/mupdf/pdf_font.c
+++ b/mupdf/pdf_font.c
@@ -921,7 +921,7 @@ pdf_loadfontdescriptor(pdf_fontdesc *fontdesc, pdf_xref *xref, fz_obj *dict, cha
                         fflush(stderr);
                         fz_warn("ignored error when loading embedded font, attempting to load system font");
 
-                        error = pdf_loadsystemfont(font, fontname, collection);
+                        error = pdf_loadsystemfont(fontdesc, fontname, collection);
                         if (error)
                                 goto cleanup;
                 }