[gtk+/gtk-2-24] quartz: Null check title before setting it
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] quartz: Null check title before setting it
- Date: Wed, 6 Mar 2013 11:40:40 +0000 (UTC)
commit 776fc82bd507fa50973d63f16790cb990d6677eb
Author: Alan McGovern <alan xamarin com>
Date: Wed Mar 6 11:06:09 2013 +0000
quartz: Null check title before setting it
This avoids a crash in objective-c.
https://bugzilla.gnome.org/show_bug.cgi?id=695278
gdk/quartz/gdkwindow-quartz.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 7302090..837b1a9 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2722,9 +2722,11 @@ gdk_window_set_decorations (GdkWindow *window,
* NSTitledWindowMask. This behaved extremely oddly when
* conditionalized upon that and since it has no side effects (i.e.
* if NSTitledWindowMask is not requested, the title will not be
- * displayed) just do it unconditionally.
+ * displayed) just do it unconditionally. We also must null check
+ * 'title' before setting it to avoid crashing.
*/
- [impl->toplevel setTitle:title];
+ if (title)
+ [impl->toplevel setTitle:title];
}
else
{
@@ -2744,7 +2746,8 @@ gdk_window_set_decorations (GdkWindow *window,
screen:screen];
[impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
[impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
- [impl->toplevel setTitle:title];
+ if (title)
+ [impl->toplevel setTitle:title];
[impl->toplevel setBackgroundColor:bg];
[impl->toplevel setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (impl->type_hint)];
[impl->toplevel setContentView:old_view];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]