From c830f8c8c7af33f3e18fee2b55b566f0350f3eee Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sun, 5 Nov 2017 08:33:12 +0100 Subject: [PATCH] fixup tones-dir --- mISDN.cpp | 2 +- port.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mISDN.cpp b/mISDN.cpp index fa9845c..d67d0e8 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -1228,7 +1228,7 @@ void PmISDN::set_tone(const char *dir, const char *tone) if (!dir || !dir[0]) { if (p_tones_interface[0]) dir = p_tones_interface; - else if (options.tones_dir[0]) + else dir = options.tones_dir; } diff --git a/port.cpp b/port.cpp index e8ca7b6..0a5687c 100644 --- a/port.cpp +++ b/port.cpp @@ -325,10 +325,12 @@ void Port::set_tone(const char *dir, const char *name) if (name == NULL) name = ""; - if (!dir || !dir[0]) + if (!dir || !dir[0]) { if (p_tones_interface[0]) dir = p_tones_interface; - dir = options.tones_dir; /* just in case we have no PmISDN instance */ + else + dir = options.tones_dir; /* just in case we have no PmISDN instance */ + } /* no counter, no eof, normal speed */ p_tone_counter = 0; -- 2.13.6