Fixed bug where tts and rate were not saving to the config file. Fixed bug that did not allow tts to be turned off.

tojam

@@ -226,10 +226,6 @@ configure_ninjam() {
             ;;
             "tts")
                 if [[ "${tts}" == "true" ]]; then
-                    ttsRate="$(dialog --backtitle "Tojam" \
-                        --rangebox "TTS Rate (0-10):" 8 50 0 10 "${ttsRate}" --stdout)"
-                    menuCode=$?
-                    [[ ${menuCode} -ne 0 ]] && continue
                     tts="$(dialog --yes-label "Enable" \
                         --no-label "Disable" \
                         --yesno "Text-to-Speech is currently enabled at rate ${ttsRate}. Change setting?" -1 -1 --stdout)"
@@ -237,6 +233,12 @@ configure_ninjam() {
                     [[ ${tts} -eq 255 ]] && continue
                     tts="${tts/0/true}"
                     tts="${tts/1/false}"
+                    if [[ "${tts}" == "true" ]]; then
+                        ttsRate="$(dialog --backtitle "Tojam" \
+                            --rangebox "TTS Rate (0-10):" 8 50 0 10 "${ttsRate}" --stdout)"
+                        menuCode=$?
+                        [[ ${menuCode} -ne 0 ]] && continue
+                    fi
                 else
                     tts="$(dialog --yes-label "Enable" \
                         --no-label "Keep Disabled" \
@@ -252,7 +254,17 @@ configure_ninjam() {
                         [[ ${menuCode} -ne 0 ]] && continue
                     fi
                 fi
-                sed -i -e "s/^tts=.*/tts=\"${tts}\"/" -e "s/^ttsRate=.*/ttsRate=\"${ttsRate}\"/" "${config}/config" &&
+                # Update or add TTS settings
+                if grep -q "^tts=" "${config}/config"; then
+                    sed -i "s/^tts=.*/tts=\"${tts}\"/" "${config}/config"
+                else
+                    echo "tts=\"${tts}\"" >> "${config}/config"
+                fi
+                if grep -q "^ttsRate=" "${config}/config"; then
+                    sed -i "s/^ttsRate=.*/ttsRate=\"${ttsRate}\"/" "${config}/config"
+                else
+                    echo "ttsRate=\"${ttsRate}\"" >> "${config}/config"
+                fi
                 if [[ "${tts}" == "true" ]]; then
                     dialog --msgbox "TTS enabled at rate ${ttsRate}." -1 -1
                 else
@@ -285,8 +297,11 @@ save_files() {
 
 tts_flags() {
     if [[ "${tts}" == "true" ]]; then
+        # Check if ninjam client supports TTS flags
+        if $ninjam --help 2>&1 | grep -q "\-tts"; then
             echo "-tts -tts-rate ${ttsRate}"
         fi
+    fi
 }