--- deliantra/server/common/button.C	2006/08/29 17:29:27	1.3
+++ deliantra/server/common/button.C	2006/08/30 12:42:56	1.4
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_button_c =
- *   "$Id: button.C,v 1.3 2006/08/29 17:29:27 elmex Exp $";
+ *   "$Id: button.C,v 1.4 2006/08/30 12:42:56 elmex Exp $";
  */
 
 /*
@@ -176,11 +176,13 @@
 {
   oblinkpt *obp = get_button_links (op);
 
+  if (!obp)
+    return;
+
   if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64(obp->value), ARG_INT(op->value)))
     return;
 
-  if (obp && obp->link)
-    activate_connection_link (obp->link, op->value, op);
+  activate_connection_link (obp->link, op->value, op);
 }
 
 /*
@@ -197,7 +199,7 @@
     return;
 
   oblinkpt *obp = get_connection_links (map, connection);
-  if (obp && obp->link)
+  if (obp)
     activate_connection_link (obp->link, state);
 }