[freetype2-demos] master 446fd0f: * src/ftgrid.c (main): Fail to open font earlier.

[Alexei Podtelezhnikov]

branch: master
commit 446fd0fd8a88156d8340dbb0c049eb5c2dbcaef6
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    * src/ftgrid.c (main): Fail to open font earlier.
---
 ChangeLog    |  4 ++++
 src/ftgrid.c | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e2decb..8f5eb0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-08  Alexei Podtelezhnikov  <address@hidden>
+
+       * src/ftgrid.c (main): Fail to open font earlier.
+
 2018-05-01  Werner Lemberg  <address@hidden>
 
        * Version 2.9.1 released.
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 4618f45..4315573 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -2043,17 +2043,6 @@
     FT_Stroker_Set( status.stroker, 32, FT_STROKER_LINECAP_BUTT,
                       FT_STROKER_LINEJOIN_BEVEL, 0x20000 );
 
-    display = FTDemo_Display_New( gr_pixel_mode_rgb24,
-                                  status.width, status.height );
-    if ( !display )
-      Fatal( "could not allocate display surface" );
-
-    grid_status_display( &status, display );
-    grid_status_colors(  &status, display );
-
-    grSetTitle( display->surface,
-                "FreeType Glyph Grid Viewer - press ? for help" );
-
     for ( ; argc > 0; argc--, argv++ )
     {
       error = FTDemo_Install_Font( handle, argv[0], 1,
@@ -2066,6 +2055,17 @@
     if ( handle->num_fonts == 0 )
       Fatal( "could not find/open any font file" );
 
+    display = FTDemo_Display_New( gr_pixel_mode_rgb24,
+                                  status.width, status.height );
+    if ( !display )
+      Fatal( "could not allocate display surface" );
+
+    grSetTitle( display->surface,
+                "FreeType Glyph Grid Viewer - press ? for help" );
+
+    grid_status_display( &status, display );
+    grid_status_colors(  &status, display );
+
     event_font_change( 0 );
 
     grid_status_rescale_initial( &status, handle );