Index: src/conf_core.h
===================================================================
--- src/conf_core.h	(revision 3693)
+++ src/conf_core.h	(revision 3694)
@@ -83,7 +83,7 @@
 		CFT_STRING library_shell;
 		CFT_LIST library_search_paths;
 
-		CFT_STRING emergency_name;         /* file name template for emergency save anonymous .pcb files (when pcb-rnd crashes); optional field: %ld --> pid; must be shorter than 240 characters. */
+		CFT_STRING emergency_name;         /* file name template for emergency save anonymous .pcb files (when pcb-rnd crashes); optional field: %ld --> pid; must be shorter than 240 characters. Don't do emergency save if this item is empty. */
 		CFT_STRING backup_name;            /* file name template for periodic backup anonymous .pcb files; optional fields: %P --> pid */
 
 		CFT_STRING save_command;
Index: src/plug_io.c
===================================================================
--- src/plug_io.c	(revision 3693)
+++ src/plug_io.c	(revision 3694)
@@ -604,7 +604,7 @@
 	char filename[256];
 
 	/* memory might have been released before this function is called */
-	if (PCB && PCB->Changed) {
+	if (PCB && PCB->Changed && (conf_core.rc.emergency_name != NULL) && (*conf_core.rc.emergency_name != '\0')) {
 		sprintf(filename, conf_core.rc.emergency_name, (long int)pcb_getpid());
 		Message(PCB_MSG_DEFAULT, _("Trying to save your layout in '%s'\n"), filename);
 		WritePCBFile(filename, DEFAULT_FMT);