Changeset 2c5ee3e

Timestamp:

Aug 31, 2010, 11:02:09 AM (14 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

8c6e2c1

Parents:

691d012

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (08/03/10 18:01:51)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (08/31/10 11:02:09)

Message:

Don't try to load default subs if zephyr has not been initialized yet.

Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>

File:

• zephyr.c (modified) (1 diff)

zephyr.c

@@ -353 +353 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  ZSubscription_t subs[10];
+  if (owl_global_is_havezephyr(&g)) {
+    ZSubscription_t subs[10];
     
-  if (ZSubscribeTo(subs,0,0) != ZERR_NONE) {
-    owl_function_error("Error subscribing to default zephyr notifications.");
-    return(-1);
+    if (ZSubscribeTo(subs,0,0) != ZERR_NONE) {
+      owl_function_error("Error subscribing to default zephyr notifications.");
+      return(-1);
+    }
   }
   return(0);