From d45103f2445ed59b7ba78faeae8061327c4ab976 Mon Sep 17 00:00:00 2001
From: Jed Barber <jjbarber@y7mail.com>
Date: Tue, 15 May 2018 16:30:58 +1000
Subject: Fixed errors with Event Dispatch and null string pointers

---
 src/fltk-menu_items.adb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/fltk-menu_items.adb')

diff --git a/src/fltk-menu_items.adb b/src/fltk-menu_items.adb
index 4c0e78c..69a8014 100644
--- a/src/fltk-menu_items.adb
+++ b/src/fltk-menu_items.adb
@@ -9,7 +9,8 @@ with
 use type
 
     System.Address,
-    Interfaces.C.int;
+    Interfaces.C.int,
+    Interfaces.C.Strings.chars_ptr;
 
 
 package body FLTK.Menu_Items is
@@ -340,9 +341,15 @@ package body FLTK.Menu_Items is
 
     function Get_Label
            (Item : in Menu_Item)
-        return String is
+        return String
+    is
+        Ptr : Interfaces.C.Strings.chars_ptr := fl_menu_item_get_label (Item.Void_Ptr);
     begin
-        return Interfaces.C.Strings.Value (fl_menu_item_get_label (Item.Void_Ptr));
+        if Ptr = Interfaces.C.Strings.Null_Ptr then
+            return "";
+        else
+            return Interfaces.C.Strings.Value (Ptr);
+        end if;
     end Get_Label;
 
     procedure Set_Label
-- 
cgit