Merge to XFA - else after returns.

core/src/fxge/win32/fx_win32_dib.cpp

Index: core/src/fxge/win32/fx_win32_dib.cpp
diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp
index b6455c35709b2ecdf123a7676a226d1198f1b774..da6a2c3ef4e5d03d74a44a8b49c8dfb9354a9235 100644
--- a/core/src/fxge/win32/fx_win32_dib.cpp
+++ b/core/src/fxge/win32/fx_win32_dib.cpp
@@ -153,7 +153,8 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadDIBitmap(WINDIB_Open_Args_ args)
     CWin32Platform* pPlatform = (CWin32Platform*)CFX_GEModule::Get()->GetPlatformData();
     if (pPlatform->m_GdiplusExt.IsAvailable()) {
         return pPlatform->m_GdiplusExt.LoadDIBitmap(args);
-    } else if (args.flags == WINDIB_OPEN_MEMORY) {
+    }
+    if (args.flags == WINDIB_OPEN_MEMORY) {
         return NULL;
     }
     HBITMAP hBitmap = (HBITMAP)LoadImageW(NULL, (wchar_t*)args.path_name, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);