diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index b9c40d4..9595226 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -97,7 +97,7 @@ jobs: # 7--- Publish a GitHub Release with auto-generated notes - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v2.3.2 + uses: softprops/action-gh-release@v2.3.3 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} diff --git a/Changelog.txt b/Changelog.txt index b94181c..5c43b75 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,6 @@ +v1.5.2 (30-Sep-2025) + - FIXED: A bug caused FlexQoS to fail the startup sequenece if the router rebooted while a QoS schedule had QoS disabled. + v1.5.1 (06-Sep-2025) - FIXED: Properly compare version by using arithmetic conversion - FIXED: Fixed new schedule keeping Flow Cache disabled when disabling QoS diff --git a/flexqos.sh b/flexqos.sh index 030eac3..c670505 100644 --- a/flexqos.sh +++ b/flexqos.sh @@ -12,8 +12,8 @@ # Contributors: @maghuro # shellcheck disable=SC1090,SC1091,SC2039,SC2154,SC3043 # amtm NoMD5check -version=1.5.1 -release=2025-09-06 +version=1.5.2 +release=2025-09-27 # Forked from FreshJR_QOS v8.8, written by FreshJR07 https://github.com/FreshJR07/FreshJR_QOS # License # FlexQoS is free to use under the GNU General Public License, version 3 (GPL-3.0). @@ -2275,12 +2275,7 @@ startup() { install_webui mount generate_bwdpi_arrays get_config - qos_schedule_apply_from_config - if [ "$(nvram get qos_enable)" = "1" ]; then - _fc_apply_policy on - else - _fc_apply_policy off - fi + _fc_apply_policy on _flush_conntrack_ cru d "${SCRIPTNAME}"_5min 2>/dev/null @@ -2330,6 +2325,12 @@ startup() { else logmsg "No TC modifications necessary" fi + + qos_schedule_apply_from_config + if [ "$(nvram get qos_enable)" != "1" ]; then + _fc_apply_policy off + _flush_conntrack_ + fi } # startup show_help() { @@ -2464,6 +2465,8 @@ needrestart=0 # initialize variable used in prompt_restart() case "${arg1}" in 'start'|'check') logmsg "$0 (pid=$$) called in ${mode} mode with $# args: $*" + SCHEDULE="$(am_settings_get "${SCRIPTNAME}"_schedule)" + if [ -n "$SCHEDULE" ]; then qos_start; fi startup ;; 'appdb')