diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2012-01-11 06:13:09 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2012-01-11 06:13:09 +0400 |
| commit | e7e5fafb9358ea4f85984e7bfbe00c5cbd87ffd5 (patch) | |
| tree | bc53039c545eb49c9acc09b9591b0913c65b0458 /source/gameengine/GamePlayer/ghost/GPG_Application.cpp | |
| parent | e33357e715fb99c03a9e3749148dd2163904cedf (diff) | |
| parent | dbdd09869b942a206ccaa9e6b4dc7b34d104c3fb (diff) | |
svn merge ^/trunk/blender -r42742:43270
conflicted files I had to fix manually:
--------------------------------------
wm.py
properties_particle.py
properties_game.py
rna_scene.c
KX_BlenderInputDevice.h
BL_BlenderDataConversion.cpp
GPG_Application.cpp
BL_Material.cpp
KX_FontObject.cpp
Diffstat (limited to 'source/gameengine/GamePlayer/ghost/GPG_Application.cpp')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 17d98d87b3c..1acf2a8ff0c 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -625,7 +625,8 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) m_ketsjiengine->SetRasterizer(m_rasterizer); m_ketsjiengine->SetTimingDisplay(frameRate, false, false); - m_ketsjiengine->SetExitKey(ConvertKeyCode(gm->exitkey)); + + KX_KetsjiEngine::SetExitKey(ConvertKeyCode(gm->exitkey)); #ifdef WITH_PYTHON CValue::SetDeprecationWarnings(nodepwarnings); #else @@ -786,6 +787,10 @@ void GPG_Application::stopEngine() void GPG_Application::exitEngine() { + // We only want to kill the engine if it has been initialized + if (!m_engineInitialized) + return; + sound_exit(); if (m_ketsjiengine) { |