diff options
| author | Christian Hergert <christian@hergert.me> | 2020-12-31 18:13:46 +0000 |
|---|---|---|
| committer | Christian Hergert <christian@hergert.me> | 2020-12-31 18:13:46 +0000 |
| commit | 378bd9fab2e51b29a90458d314bbe23c2ad7ee4c (patch) | |
| tree | ac270b2518c379d52cf4663337fb83c20bc8bd9d | |
| parent | d5963ad1092457dd94df5e9cc67f3c368700168e (diff) | |
| parent | 4ad5e7790706924cd8a6bc5957a18d533f6808a5 (diff) | |
| download | gtk+-378bd9fab2e51b29a90458d314bbe23c2ad7ee4c.tar.gz | |
Merge branch 'macos-mojave' into 'master'
macos: do not crash in mojave
See merge request GNOME/gtk!3020
| -rw-r--r-- | gdk/macos/gdkmacosmonitor.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gdk/macos/gdkmacosmonitor.c b/gdk/macos/gdkmacosmonitor.c index fdeadadcea..ad124a9e64 100644 --- a/gdk/macos/gdkmacosmonitor.c +++ b/gdk/macos/gdkmacosmonitor.c @@ -145,6 +145,7 @@ GetSubpixelLayout (CGDirectDisplayID screen_id) static char * GetLocalizedName (NSScreen *screen) { +#ifdef AVAILABLE_MAC_OS_X_VERSION_10_15_AND_LATER GDK_BEGIN_MACOS_ALLOC_POOL; NSString *str; @@ -158,6 +159,9 @@ GetLocalizedName (NSScreen *screen) GDK_END_MACOS_ALLOC_POOL; return g_steal_pointer (&name); +#else + return NULL; +#endif } static char * |