The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix another part of issue 3716 missed in the last revision.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6602 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-12-17 22:13:58 +00:00
parent 22f19f6fdb
commit d01542ee0a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -102,6 +102,9 @@ include(CheckLib)
include(FindOpenGL REQUIRED) include(FindOpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
if(NOT OPENGL_GLU_FOUND)
message(FATAL_ERROR "GLU is required but not found")
endif()
include(FindALSA OPTIONAL) include(FindALSA OPTIONAL)
if(ALSA_FOUND) if(ALSA_FOUND)
@ -297,8 +300,6 @@ if(WIN32)
find_library(GLEW glew32s PATHS Externals/GLew) find_library(GLEW glew32s PATHS Externals/GLew)
include_directories(Externals/GLew/include) include_directories(Externals/GLew/include)
else() else()
check_lib(GLU GLU GL/glu.h REQUIRED)
check_lib(GLEW GLEW GL/glew.h) check_lib(GLEW GLEW GL/glew.h)
if(NOT GLEW_FOUND) if(NOT GLEW_FOUND)
message("Shared GLEW not found, falling back to the static library") message("Shared GLEW not found, falling back to the static library")

1
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -700,6 +700,7 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))
void CFrame::OnRenderParentClose(wxCloseEvent& event) void CFrame::OnRenderParentClose(wxCloseEvent& event)
{ {
DoStop(); DoStop();
if (Core::GetState() == Core::CORE_UNINITIALIZED)
event.Skip(); event.Skip();
} }