From 9747c9cce0b787df0f59a5b11dd56f1f7a94839b Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 12 Jun 2011 17:25:50 +1000 Subject: [PATCH] Shut down shared context properly to avoid segfault on close --- Projects/CodeBlocks/SleepyHead.depend | 2 +- src/graphs/graph.cpp | 9 +++++++-- src/version.h | 12 ++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 78d2c1d8..3f285a8f 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8307,7 +8307,7 @@ -1307862895 /home/mark/projects/git/sleepyhead/src/version.h +1307863514 /home/mark/projects/git/sleepyhead/src/version.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index f4dfc7ff..4291a475 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -59,6 +59,9 @@ FTFont *texfont=NULL; list font_paths; +wxGLContext *shared_context=NULL; + + // Must be called from a thread inside the application. void GraphInit() { @@ -111,6 +114,10 @@ void GraphDone() delete normalfont; gfont_init=false; } + if (shared_context) { + delete shared_context; + shared_context=NULL; + } } void GetTextExtent(wxString text, float & width, float & height, FTFont *font=normalfont) @@ -286,7 +293,6 @@ gGraphWindow::gGraphWindow() { } -wxGLContext *shared_context=NULL; gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & title,const wxPoint &pos,const wxSize &size,long flags) : wxGLCanvas( parent, shared_context, id, pos, size, flags, title, (int *)wx_gl_attribs, wxNullPalette ) @@ -328,7 +334,6 @@ gGraphWindow::~gGraphWindow() for (list::iterator l=layers.begin();l!=layers.end();l++) delete (*l); layers.clear(); - delete gl_context; } diff --git a/src/version.h b/src/version.h index 285e5eb3..c85e741e 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 5137; - static const long REVISION = 11377; + static const long BUILD = 5140; + static const long REVISION = 11387; //Miscellaneous Version Types - static const long BUILDS_COUNT = 4712; - #define RC_FILEVERSION 0,7,5137,11377 - #define RC_FILEVERSION_STRING "0, 7, 5137, 11377\0" - static const char FULLVERSION_STRING[] = "0.7.5137.11377"; + static const long BUILDS_COUNT = 4722; + #define RC_FILEVERSION 0,7,5140,11387 + #define RC_FILEVERSION_STRING "0, 7, 5140, 11387\0" + static const char FULLVERSION_STRING[] = "0.7.5140.11387"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;