X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=port.cpp;h=0a5687c1d6fcd5120e959119a4d050ae6cdaa22a;hp=32184a849a3e545d1d27d0b9f5f8ea352f7f309c;hb=5566f74eb29be75da44e29ba72ee6f015249ce61;hpb=034d3a91404addedc1c7a3494862c79532b0b878

diff --git a/port.cpp b/port.cpp
index 32184a8..0a5687c 100644
--- a/port.cpp
+++ b/port.cpp
@@ -159,8 +159,10 @@ Port::Port(int type, const char *portname, struct port_settings *settings, struc
 		memset(&p_settings, 0, sizeof(p_settings));
 	}
 	SCPY(p_name, portname);
-	if (interface)
+	if (interface) {
 		SCPY(p_interface_name, interface->name);
+		SCPY(p_tones_interface, interface->tones_dir);
+	}
 	p_tone_dir[0] = '\0';
 	p_type = type;
 	p_serial = port_serial++;
@@ -323,8 +325,12 @@ void Port::set_tone(const char *dir, const char *name)
 	if (name == NULL)
 		name = "";
 
-	if (!dir || !dir[0])
-		dir = options.tones_dir; /* just in case we have no PmISDN instance */
+	if (!dir || !dir[0]) {
+		if (p_tones_interface[0])
+			dir = p_tones_interface;
+		else
+			dir = options.tones_dir; /* just in case we have no PmISDN instance */
+	}
 
 	/* no counter, no eof, normal speed */
 	p_tone_counter = 0;
@@ -768,6 +774,7 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
 		case CODEC_MONO:
 		case CODEC_STEREO:
 		case CODEC_8BIT:
+		memset(&dummyheader, 0, sizeof(dummyheader));
 		ret = fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
 		break;