diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/osd/sdl/sdl.mak | 4 | ||||
-rw-r--r-- | src/osd/windows/window.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 778cec9661e..479abdd6624 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -734,8 +734,8 @@ ifeq ($(SDL_LIBVER),sdl2) LIBS += -lSDL2 -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static BASELIBS += -lSDL2 -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static else -LIBS += -lSDL -static -BASELIBS += -lSDL -static +LIBS += -lSDL -lws2_32 -static +BASELIBS += -lSDL -lws2_32 -static endif LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi BASELIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c index 5ff7669cd9a..301b885b4d0 100644 --- a/src/osd/windows/window.c +++ b/src/osd/windows/window.c @@ -1405,9 +1405,12 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR // destroy: clean up all attached rendering bits and NULL out our hwnd case WM_DESTROY: - window->m_renderer->destroy(); - global_free(window->m_renderer); - window->m_renderer = NULL; + if (!(window->m_renderer == NULL)) + { + window->m_renderer->destroy(); + global_free(window->m_renderer); + window->m_renderer = NULL; + } window->m_hwnd = NULL; return DefWindowProc(wnd, message, wparam, lparam); |