FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, "when using windownames and switching between fullscreen and windowed

Browse Source 
mode GraphicsWindowCocoa crashes. Attached you'll find a fix for that bug.
"
This commit is contained in:
Robert Osfield
2009-05-19 10:45:57 +00:00
parent ef14ed46f4
commit d85a2e2836
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgViewer/GraphicsWindowCocoa.mm
View File

@@ -1150,7 +1150,8 @@ bool GraphicsWindowCocoa::setWindowDecorationImplementation(bool flag)
if (new_win) {
[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];
@@ -1272,9 +1273,8 @@ void GraphicsWindowCocoa::setWindowName (const std::string & name)
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];
}