Fixed auto mapgroup issue + new sourcemod 1.10 6482

lenosisnickerboa · Apr 12, 2020 · d927e5e · d927e5e
1 parent 3f5b807
commit d927e5e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/mods/linux/Makefile b/mods/linux/Makefile
@@ -5,8 +5,8 @@ METAMOD_HOME_URL="http://www.metamodsource.net/"
 METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-linux.tar.gz"
 METAMOD_VERSION="1.10.7-git971"
 SOURCEMOD_HOME_URL="http://www.sourcemod.net/"
-SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6478-linux.tar.gz"
-SOURCEMOD_VERSION="1.10.0-git6478"
+SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6482-linux.tar.gz"
+SOURCEMOD_VERSION="1.10.0-git6482"
 export
 
 all: mods

diff --git a/mods/windows/Makefile b/mods/windows/Makefile
@@ -5,8 +5,8 @@ METAMOD_HOME_URL="http://www.metamodsource.net/"
 METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-windows.zip"
 METAMOD_VERSION="1.10.7-git971"
 SOURCEMOD_HOME_URL="http://www.sourcemod.net/"
-SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6478-windows.zip"
-SOURCEMOD_VERSION="1.10.0-git6478"
+SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6482-windows.zip"
+SOURCEMOD_VERSION="1.10.0-git6482"
 export
 
 all: mods

diff --git a/src/config_page.tcl b/src/config_page.tcl
@@ -410,9 +410,11 @@ proc UpdateRunPage {} {
         set gameModeType [set $gameModeTypeName]
         set autoSelectedMapGroup [string map {" " ""} "auto_$gameModeType"]
         if { "$autoSelectedMapGroup" != "$mapGroup" } {
-            # Now this is the selected map group
-            set mapGroup $autoSelectedMapGroup
-            set $mapGroupName $mapGroup
+            if { [lsearch -exact $values $autoSelectedMapGroup] != -1 } {
+                # Now this is the selected map group
+                set mapGroup $autoSelectedMapGroup
+                set $mapGroupName $mapGroup
+            }
         }
     }
     if { [lsearch -exact $values $mapGroup] == -1 } {

diff --git a/src/contribs.tcl b/src/contribs.tcl
@@ -20,9 +20,9 @@ set windows_wget_url "https://eternallybored.org/misc/wget/releases/wget-1.20.3-
 set linux_metamod_version "1.10.7-git971"
 set linux_metamod_home_url "http://www.metamodsource.net/"
 set linux_metamod_url "https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-linux.tar.gz"
-set linux_sourcemod_version "1.10.0-git6478"
+set linux_sourcemod_version "1.10.0-git6482"
 set linux_sourcemod_home_url "http://www.sourcemod.net/"
-set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6478-linux.tar.gz"
+set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6482-linux.tar.gz"
 set linux_franug_knifes_version "sha-ff449c6-2016-05-05"
 set linux_franug_knifes_home_url "https://github.com/Franc1sco/Franug-Knifes"
 set linux_franug_knifes_url "https://github.com/Franc1sco/Franug-Knifes/archive/ff449c6.zip"
@@ -59,9 +59,9 @@ set linux_splewis_pugsetup_url "https://github.com/splewis/csgo-pug-setup/releas
 set windows_metamod_version "1.10.7-git971"
 set windows_metamod_home_url "http://www.metamodsource.net/"
 set windows_metamod_url "https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-windows.zip"
-set windows_sourcemod_version "1.10.0-git6478"
+set windows_sourcemod_version "1.10.0-git6482"
 set windows_sourcemod_home_url "http://www.sourcemod.net/"
-set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6478-windows.zip"
+set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6482-windows.zip"
 set windows_franug_knifes_version "sha-ff449c6-2016-05-05"
 set windows_franug_knifes_home_url "https://github.com/Franc1sco/Franug-Knifes"
 set windows_franug_knifes_url "https://github.com/Franc1sco/Franug-Knifes/archive/ff449c6.zip"

diff --git a/src/version.tcl b/src/version.tcl
@@ -3,4 +3,4 @@
 # The next line is executed by /bin/sh, but not tcl \
 exec wish "$0" ${1+"$@"}
 
-set version "2.8"
+set version "2.8.1"