--- deliantra/server/lib/cf.pm	2008/05/01 06:33:19	1.428
+++ deliantra/server/lib/cf.pm	2008/05/03 15:17:13	1.429
@@ -2033,8 +2033,8 @@
    cf::lock_wait "map_find:$path";
 
    $cf::MAP{$path} || do {
-      my $guard1 = cf::lock_acquire "map_find:$path";
-      my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
+      my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
+      my $guard2 = cf::lock_acquire "map_find:$path";
 
       my $map = new_from_path cf::map $path
          or return;
@@ -2047,8 +2047,8 @@
       if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
          # doing this can freeze the server in a sync job, obviously
          #$cf::WAIT_FOR_TICK->wait;
-         undef $guard1;
          undef $guard2;
+         undef $guard1;
          $map->reset;
          return find $path;
       }