--- deliantra/server/lib/cf.pm	2007/01/14 18:00:34	1.173
+++ deliantra/server/lib/cf.pm	2007/01/14 22:14:35	1.176
@@ -10,7 +10,7 @@
 use Safe;
 use Safe::Hole;
 
-use Coro 3.3 ();
+use Coro 3.4 ();
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
@@ -1537,20 +1537,6 @@
    $self->reset_at <= $cf::RUNTIME
 }
 
-sub rename {
-   my ($self, $new_path) = @_;
-
-   normalise $new_path;
-
-   $self->unlink_save;
-
-   delete $cf::MAP{$self->path};
-   $self->{path} = $new_path; $self->path ($self->{path});
-   $cf::MAP{$self->path} = $self;
-
-   $self->save;
-}
-
 sub reset {
    my ($self) = @_;
 
@@ -1577,9 +1563,18 @@
 sub nuke {
    my ($self) = @_;
 
+   delete $cf::MAP{$self->path};
+
+   $self->unlink_save;
+
+   bless $self, "cf::map";
+   delete $self->{deny_reset};
    $self->{deny_save} = 1;
    $self->reset_timeout (1);
-   $self->rename ("{nuke}/" . ($nuke_counter++));
+   $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
+
+   $cf::MAP{$self->path} = $self;
+
    $self->reset; # polite request, might not happen
 }
 
@@ -2235,7 +2230,9 @@
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
-      async { Event::one_event };
+      (async {
+         Event::one_event;
+      })->prio (Coro::PRIO_MAX);
    };
 
    cfg_load;
@@ -2393,13 +2390,21 @@
    warn "reloaded";
 };
 
+our $RELOAD_WATCHER; # used only during reload
+
 register_command "reload" => sub {
    my ($who, $arg) = @_;
 
    if ($who->flag (FLAG_WIZ)) {
-      $who->message ("start of reload.");
-      reload;
-      $who->message ("end of reload.");
+      $who->message ("reloading server.");
+
+      # doing reload synchronously and two reloads happen back-to-back,
+      # coro crashes during coro_state_free->destroy here.
+
+      $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
+         reload;
+         undef $RELOAD_WATCHER;
+      });
    }
 };