Changeset 1192 for trunk

Timestamp:

Oct 27, 2008 4:23:04 PM (16 years ago)

Author:

gah

Message:

attempt to fix libGLcore segfault by reordering glut initialization routines

File:

• trunk/packages/vizservers/nanovis/nanovis.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -2226 +2226 @@
     stats.start = tv;
 
+    /* Initialize GLUT here so it can parse and remove GLUT-specific 
+     * command-line options before we parse the command-line below. */
+    glutInit(&argc, argv);
+    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
+    glutInitWindowSize(NanoVis::win_width, NanoVis::win_height);
+    glutInitWindowPosition(10, 10);
+    glutDisplayFunc(NanoVis::display);
+    glutIdleFunc(idle);
+    glutReshapeFunc(NanoVis::resize_offscreen_buffer);
+#ifndef XINETD
+    glutMouseFunc(NanoVis::mouse);
+    glutMotionFunc(NanoVis::motion);
+    glutKeyboardFunc(NanoVis::keyboard);
+#endif
+
+    render_window = glutCreateWindow(argv[0]);
+
+
     while (1) {
         static struct option long_options[] = {
@@ -2329 +2347 @@
 #endif
 
-    glutInit(&argc, argv);
-    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
-
-    glutInitWindowSize(NanoVis::win_width, NanoVis::win_height);
-
-    glutInitWindowPosition(10, 10);
-    render_window = glutCreateWindow(argv[0]);
-    glutDisplayFunc(NanoVis::display);
-
-#ifndef XINETD
-    glutMouseFunc(NanoVis::mouse);
-    glutMotionFunc(NanoVis::motion);
-    glutKeyboardFunc(NanoVis::keyboard);
-#endif
-
-    glutIdleFunc(idle);
-    glutReshapeFunc(NanoVis::resize_offscreen_buffer);
-
     NanoVis::init(path);
     if (newPath != NULL) {