fixup tones-dir

diff --git a/mISDN.cpp b/mISDN.cpp
index fa9845c..d67d0e8 100644 (file)
--- 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 (file)
--- 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;