mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed X11 error caused by the previous commit

Browse Source
This commit is contained in:
Laurent Gomila 2012-09-19 23:12:45 +02:00
parent b75e340dc0
commit f5bca33eaa
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/SFML/Window/Linux/GlxContext.cpp
View File

@ -40,8 +40,9 @@ namespace priv
{ {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
GlxContext::GlxContext(GlxContext* shared) : GlxContext::GlxContext(GlxContext* shared) :
m_window (0), m_window (0),
m_context(NULL) m_context (NULL),
m_ownsWindow(true)
{ {
// Open a connection with the X server // Open a connection with the X server
m_display = OpenDisplay(); m_display = OpenDisplay();
@ -65,8 +66,9 @@ m_context(NULL)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
GlxContext::GlxContext(GlxContext* shared, const ContextSettings& settings, const WindowImpl* owner, unsigned int bitsPerPixel) : GlxContext::GlxContext(GlxContext* shared, const ContextSettings& settings, const WindowImpl* owner, unsigned int bitsPerPixel) :
m_window (0), m_window (0),
m_context(NULL) m_context (NULL),
m_ownsWindow(false)
{ {
// Open a connection with the X server // Open a connection with the X server
// (important: must be the same display as the owner window) // (important: must be the same display as the owner window)
@ -83,8 +85,9 @@ m_context(NULL)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
GlxContext::GlxContext(GlxContext* shared, const ContextSettings& settings, unsigned int width, unsigned int height) : GlxContext::GlxContext(GlxContext* shared, const ContextSettings& settings, unsigned int width, unsigned int height) :
m_window (0), m_window (0),
m_context(NULL) m_context (NULL),
m_ownsWindow(true)
{ {
// Open a connection with the X server // Open a connection with the X server
m_display = OpenDisplay(); m_display = OpenDisplay();
@ -118,7 +121,7 @@ GlxContext::~GlxContext()
} }
// Destroy the window if we own it // Destroy the window if we own it
if (m_window) if (m_window && m_ownsWindow)
{ {
XDestroyWindow(m_display, m_window); XDestroyWindow(m_display, m_window);
XFlush(m_display); XFlush(m_display);