check video driver creation

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

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index e5eac5a5b460c616d51ebc4b58fd02374ad58ba1..20359322766bf76890d8494c4fa305d7f1795563 100644 (file)
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -45,10 +45,9 @@
   (let* ((createDevice (get-irrlicht-proc "createDevice"))
          (device (createDevice device-type window-size bits fullscreen stencilbuffer
                                vsync receiver)))
-    (cond ((null-object? device)
-           (error "In procedure create-device: Device cannot be created"))
-          (else
-           device))))
+    (if (null-object? device)
+        (error "In procedure create-device: Device cannot be created")
+        device)))
 
 (define-method (get-cursor-control (device <irrlicht-device>))
   (let ((getCursorControl (get-irrlicht-proc "getCursorControl" device)))
@@ -71,8 +70,11 @@
     (getTimer device)))
 
 (define-method (get-video-driver (device <irrlicht-device>))
-  (let ((getVideoDriver (get-irrlicht-proc "getVideoDriver" device)))
-    (getVideoDriver device)))
+  (let* ((getVideoDriver (get-irrlicht-proc "getVideoDriver" device))
+         (driver (getVideoDriver device)))
+    (if (null-object? driver)
+        (error "In procedure get-video-driver: Driver cannot be created")
+        driver)))
 
 (define-method (is-window-active? (device <irrlicht-device>))
   (let ((isWindowActive (get-irrlicht-proc "isWindowActive" device)))