X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=port.cpp;h=0a5687c1d6fcd5120e959119a4d050ae6cdaa22a;hp=b6c82d97d7f94b91b1ce194be259010da00162df;hb=79bd731c0db3e3202cfeed2af3fb217ae744b70f;hpb=cdca6a713587f88a357147569dd5b2103923ad72 diff --git a/port.cpp b/port.cpp index b6c82d9..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;