Check null objects

[guile-irrlicht.git] / irrlicht / device.scm

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index b18a58e690c49870a4b340f33b86ee6b76008757..04988d39602e24deb51ead3f2cce967fccbaa750 100644 (file)
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -46,16 +46,13 @@
        "In procedure create-device: Wrong type argument (expecting <event-receiver>):"
        receiver))
 
-  (make <irrlicht-device>
-    #:irr-pointer
-    ((get-irrlicht-proc "createDevice")
-     device-type
-     window-size
-     bits
-     fullscreen
-     stencilbuffer
-     vsync
-     receiver)))
+  (let* ((createDevice (get-irrlicht-proc "createDevice"))
+         (device-pointer (createDevice device-type window-size bits fullscreen stencilbuffer
+                                       vsync receiver)))
+    (cond ((null-pointer? device-pointer)
+           (error "In procedure create-device: Device cannot be created"))
+          (else
+           (make <irrlicht-device> #:irr-pointer device-pointer)))))
 
 (define-method (get-cursor-control (device <irrlicht-device>))
   (let ((getCursorControl (get-irrlicht-proc "getCursorControl" device)))