[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25141] trunk/blender/intern/ghost/intern/ GHOST_SystemX11.cpp: [#20266] Blender starting without X11 segfaults

[Martin Poirier]

Revision: 25141
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25141
Author:   theeth
Date:     2009-12-05 21:06:19 +0100 (Sat, 05 Dec 2009)

Log Message:
-----------
[#20266] Blender starting without X11 segfaults

Abort when ghost x11 cannot initialize a display.

It would just crash later anyway, better to abort with a reasonable error message.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2009-12-05 19:27:26 UTC (rev 25140)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2009-12-05 20:06:19 UTC (rev 25141)
@@ -66,8 +66,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#include <iostream>
 #include <vector>
 #include <stdio.h> // for fprintf only
+#include <cstdlib> // for exit
 
 typedef struct NDOFPlatformInfo {
 	Display *display;
@@ -96,7 +98,10 @@
 {
 	m_display = XOpenDisplay(NULL);
 	
-	if (!m_display) return;
+	if (!m_display) {
+		std::cerr << "Unable to open a display" << std::endl;
+		abort(); //was return before, but this would just mean it will crash later
+	}
 	
 #ifdef __sgi
 	m_delete_window_atom