Changeset 10242 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

Timestamp:

05/19/09 12:45:57 (4 years ago)

Author:

robert

Message:

From Stephan Huber, "when using windownames and switching between fullscreen and windowed
mode GraphicsWindowCocoa? crashes. Attached you'll find a fix for that bug.
"

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -1151 +1151 @@
         [new_win setContentView: [_window contentView]];
         setupNSWindow(new_win);
-        [new_win setTitle: [_window title]];
+        NSString* title = (_traits.valid()) ? [NSString stringWithUTF8String: _traits->windowName.c_str()] : @"";
+        [new_win setTitle: title ];
         [_window close];
         [_window release];
@@ -1273 +1274 @@
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     
-    NSString* title = [NSString stringWithCString: name.c_str() encoding: NSUTF8StringEncoding];
+    NSString* title = [NSString stringWithUTF8String: name.c_str()];
     [_window setTitle: title];
-    [title release];
     [pool release];
 }