1 files changed, 14 insertions, 6 deletions

diff --git a/gs/Resource/Init/gs_fonts.ps b/gs/Resource/Init/gs_fonts.ps
index a597c5aed..8ab6872e5 100644
--- a/gs/Resource/Init/gs_fonts.ps
+++ b/gs/Resource/Init/gs_fonts.ps
@@ -385,12 +385,20 @@ systemdict /NONATIVEFONTMAP known .setnativefontmapbuilt
         pop pop pop
       }{
         % we could open the font file
-        .findfontname
-        not { dup 0 get } if  % stack: (newname) [ (name) (path) ]
-        % DEBUG { (  found ) print dup print (\n) print flush } if
-        % add entry to the fontmap
-        1 index exch 0 exch dup type /nametype ne {cvn} if put
-        aload pop .definefontmap
+        mark 2 1 roll
+        {.findfontname} stopped
+        {
+          cleartomark
+          pop pop
+        }
+        {
+          3 -1 roll pop
+          not { dup 0 get } if  % stack: (newname) [ (name) (path) ]
+          % DEBUG { (  found ) print dup print (\n) print flush } if
+          % add entry to the fontmap
+          1 index exch 0 exch dup type /nametype ne {cvn} if put
+          aload pop .definefontmap
+        } ifelse
       } ifelse
     } forall
   } if