--- deliantra/server/lib/cf.pm	2007/09/04 05:43:21	1.356
+++ deliantra/server/lib/cf.pm	2007/09/04 08:42:58	1.357
@@ -1878,9 +1878,9 @@
    my $path = $self->{path};
 
    {
-      my $guard1 = cf::lock_acquire "map_data:$path";
-      my $guard2 = cf::lock_acquire "map_load:$path";
+      my $guard = cf::lock_acquire "map_data:$path";
 
+      return unless $self->valid;
       return if $self->in_memory != cf::MAP_SWAPPED;
 
       $self->in_memory (cf::MAP_LOADING);