--- deliantra/server/lib/cf.pm	2007/01/14 19:55:37	1.174
+++ deliantra/server/lib/cf.pm	2007/01/14 21:20:51	1.175
@@ -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;
@@ -2230,7 +2230,11 @@
    # 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 {
+         warn "BP1\n";#d#
+         Event::one_event;
+         warn "BP2\n";#d#
+      })->prio (Coro::PRIO_MAX);
    };
 
    cfg_load;
@@ -2388,13 +2392,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;
+      });
    }
 };