mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-29 00:48:58 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for map editor hanging on some windows installations

Browse Source
This commit is contained in:
Mark Vejvoda
2013-11-17 22:42:51 +00:00
parent 7830785e7f
commit b74271348c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/glest_map_editor/main.cpp
View File

@@ -634,7 +634,9 @@ void MainWindow::onPaint(wxPaintEvent &event) {
return; return;
} }
#if wxCHECK_VERSION(2, 9, 1) #if wxCHECK_VERSION(2, 9, 3)
#elif wxCHECK_VERSION(2, 9, 1)
glCanvas->setCurrentGLContext(); glCanvas->setCurrentGLContext();
#endif #endif
@@ -1445,6 +1447,13 @@ GlCanvas::~GlCanvas() {
void GlCanvas::setCurrentGLContext() { void GlCanvas::setCurrentGLContext() {
#ifndef __APPLE__ #ifndef __APPLE__
#if wxCHECK_VERSION(2, 9, 1)
if(this->context == NULL) {
this->context = new wxGLContext(this);
}
#endif
if(this->context) { if(this->context) {
this->SetCurrent(*this->context); this->SetCurrent(*this->context);
} }