From 98b20b547e2ab267575719bd5a306e94cb9e7989 Mon Sep 17 00:00:00 2001 From: Tommi Komulainen Date: Sat, 29 Mar 2008 11:35:51 +0200 Subject: [PATCH] OSX: handle gracefully NULL title * clutter/osx/clutter-stage-osx.c (ClutterGLWindow, clutter_stage_osx_set_title): NSString:stringWithUTF8String: does not accept NULL values, use empty string ("") instead. Avoids potential crash. --- clutter/clutter/osx/clutter-stage-osx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clutter/clutter/osx/clutter-stage-osx.c b/clutter/clutter/osx/clutter-stage-osx.c index d8ca25e..44004ef 100644 --- a/clutter/clutter/osx/clutter-stage-osx.c +++ b/clutter/clutter/osx/clutter-stage-osx.c @@ -57,7 +57,7 @@ clutter_stage_osx_state_update (ClutterStageOSX *self, [self setDelegate: self]; [self useOptimizedDrawing: YES]; [self setContentView: aView]; - [self setTitle:[NSString stringWithUTF8String: aTitle]]; + [self setTitle:[NSString stringWithUTF8String: aTitle ? aTitle : ""]]; stage = aStage; } return self; @@ -425,7 +425,7 @@ clutter_stage_osx_set_title (ClutterStage *stage, CLUTTER_OSX_POOL_ALLOC(); if (CLUTTER_ACTOR_IS_REALIZED (CLUTTER_ACTOR (stage))) - [self->window setTitle:[NSString stringWithUTF8String:title]]; + [self->window setTitle:[NSString stringWithUTF8String: title ? title : ""]]; CLUTTER_OSX_POOL_RELEASE(); } -- 1.5.4.4