kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

quit blender if the first X11 window fails to open.

Browse Source 
mainly just to avoid a segfault so the user knows its not a bug.
This commit is contained in:
Campbell Barton 2010-12-01 07:15:05 +00:00
parent f5f332892c
commit 8a761a374a
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@ -176,10 +176,21 @@ GHOST_WindowX11(
int attributes[40], i, samples;
Atom atoms[2];
int natom;
int glxVersionMajor, glxVersionMinor; // As in GLX major.minor
int glxVersionMajor, glxVersionMinor; // As in GLX major.mino
/* initialize incase X11 fails to load */
memset(&m_xtablet, 0, sizeof(m_xtablet));
m_visual= NULL;
if (!glXQueryVersion(m_display, &glxVersionMajor, &glxVersionMinor)) {
printf("%s:%d: X11 glXQueryVersion() failed, verify working openGL system!\n", __FILE__, __LINE__);
/* exit if this is the first window */
if(s_firstContext==NULL) {
printf("initial window could not find the GLX extension, exit!\n");
exit(1);
}
return;
}
@ -211,6 +222,12 @@ GHOST_WindowX11(
if (samples == 0) {
/* All options exhausted, cannot continue */
printf("%s:%d: X11 glXChooseVisual() failed, verify working openGL system!\n", __FILE__, __LINE__);
if(s_firstContext==NULL) {
printf("initial window could not find the GLX extension, exit!\n");
exit(1);
}
return;
}
} else {
@ -221,8 +238,6 @@ GHOST_WindowX11(
}
}
memset(&m_xtablet, 0, sizeof(m_xtablet));
// Create a bunch of attributes needed to create an X window.