Update surface.c and window.c

Author: yunline

src_c/surface.c

@@ -1610,13 +1610,13 @@ pg_DisplayFormatAlpha(SDL_Surface *surface)
     Uint32 gmask = 0x0000ff00;
     Uint32 bmask = 0x000000ff;
 
-    if (!pg_GetDefaultConvertFormat()) {
+    dformat = pg_GetDefaultConvertFormat();
+    if (!dformat) {
         SDL_SetError(
             "No convert format has been set, try display.set_mode()"
             " or Window.get_surface().");
         return NULL;
     }
-    dformat = pg_GetDefaultConvertFormat();
 
     switch (dformat->BytesPerPixel) {
         case 2:

src_c/window.c

@@ -157,12 +157,6 @@ window_get_surface(pgWindowObject *self)
     if (!_surf) {
         return RAISE(pgExc_SDLError, SDL_GetError());
     }
-    if (self->surf == NULL) {
-        self->surf = pgSurface_New2(_surf, SDL_FALSE);
-        if (!self->surf)
-            return NULL;
-    }
-    self->surf->surf = _surf;
 
     if (pg_GetDefaultConvertFormat() == NULL) {
         if (pg_SetDefaultConvertFormat(_surf->format->format) == NULL) {
@@ -172,6 +166,13 @@ window_get_surface(pgWindowObject *self)
         }
     }
 
+    if (self->surf == NULL) {
+        self->surf = pgSurface_New2(_surf, SDL_FALSE);
+        if (!self->surf)
+            return NULL;
+    }
+    self->surf->surf = _surf;
+
     Py_INCREF(self->surf);
     return (PyObject *)self->surf;
 }