--- gvpe/src/vped.C	2004/01/29 18:55:10	1.15
+++ gvpe/src/vped.C	2004/05/10 20:04:25	1.17
@@ -151,8 +151,8 @@
 {
   network.shutdown_all ();
 
-  if (pidfilename)
-    remove_pid (pidfilename);
+  if (conf.pidfilename)
+    remove_pid (conf.pidfilename);
 
   slog (L_INFO, _("terminating with exit code %d"), c);
 
@@ -248,8 +248,8 @@
       slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
 #endif
 
-  make_names ();
   conf.read_config (true);
+  make_names ();
 
   set_loglevel (llevel != L_NONE ? llevel : conf.llevel);