v1.3.1

* Fixed System.Runtime.Serialization.SerializationException exception.
SilentSys · Mar 4, 2016 · 0b9c71a · 0b9c71a
1 parent e77e0f4
commit 0b9c71a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/SLAM/Form1.vb b/SLAM/Form1.vb
@@ -5,7 +5,6 @@ Imports System.Text.RegularExpressions
 Imports System.Threading
 Imports SLAM.XmlSerialization
 Imports SLAM.SourceGame
-Imports SLAM.Track
 Imports System.Net.Http
 
 Public Class Form1
@@ -782,10 +781,10 @@ Public Class Form1
 
             For Each index In TrackList.SelectedIndices
                 GetCurrentGame.tracks(index).volume = SetVolumeDialog.Volume
-                SaveTrackKeys(GetCurrentGame)
-                ReloadTracks(GetCurrentGame)
-                RefreshTrackList()
             Next
+            SaveTrackKeys(GetCurrentGame)
+            ReloadTracks(GetCurrentGame)
+            RefreshTrackList()
 
         End If
 

diff --git a/SLAM/My Project/AssemblyInfo.vb b/SLAM/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.3.0.0")> 
-<Assembly: AssemblyFileVersion("1.3.0.0")> 
+<Assembly: AssemblyVersion("1.3.1.0")> 
+<Assembly: AssemblyFileVersion("1.3.1.0")> 
diff --git a/SLAM/SLAM.vbproj b/SLAM/SLAM.vbproj
@@ -137,7 +137,6 @@
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="SourceGame.vb" />
-    <Compile Include="Track.vb" />
     <Compile Include="TrimForm.Designer.vb">
       <DependentUpon>TrimForm.vb</DependentUpon>
     </Compile>

diff --git a/SLAM/SourceGame.vb b/SLAM/SourceGame.vb
@@ -1,6 +1,4 @@
-Imports SLAM.Track
-
-Public Class SourceGame
+Public Class SourceGame
     Public name As String
     Public id As Integer
     Public directory As String
@@ -19,4 +17,12 @@ Public Class SourceGame
     Public tracks As New List(Of Track)
     Public blacklist As New List(Of String) From {"slam", "slam_listtracks", "list", "tracks", "la", "slam_play", "slam_play_on", "slam_play_off", "slam_updatecfg", "slam_curtrack", "slam_saycurtrack", "slam_sayteamcurtrack"}
 
+    Public Class track
+        Public name As String
+        Public tags As New List(Of String)
+        Public hotkey As String = vbNullString
+        Public volume As Integer = 100
+        Public startpos As Integer
+        Public endpos As Integer
+    End Class
 End Class
diff --git a/SLAM/Track.vb b/SLAM/Track.vb