Version 1.5.1

- Fixed log getting extremely large by joystick trouble - A few stations added
Koenvh1 · Jan 8, 2017 · 160dd2c · 160dd2c
1 parent c871ea4
commit 160dd2c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 3 deletions.
diff --git a/server/ETS2 Local Radio desktop/Main.cs b/server/ETS2 Local Radio desktop/Main.cs
@@ -347,6 +347,7 @@ private void Main_FormClosing(object sender, EventArgs e)
                 myServer.Stop();
                 writeFile("none", "0", "0");
                 DeleteException();
+                joystickTimer.Stop();
                 joystick.Release();
             }
             catch (Exception ex)
@@ -559,10 +560,14 @@ private void joystickTimer_Tick(object sender, EventArgs e)
             if (joystick == null)
             {
                 AttachJoystick();
+                if (joystick == null)
+                {
+                    return;
+                }
             }
             try
             {
-                bool[] controllerInput = new bool[joystick.State.GetButtons().Length + 4]; ;// = joystick.State.GetButtons().Concat(joystick.State.GetPointOfViewControllers()).ToArray();
+                bool[] controllerInput = new bool[joystick.State.GetButtons().Length + 4]; // = joystick.State.GetButtons().Concat(joystick.State.GetPointOfViewControllers()).ToArray();
                 joystick.State.GetButtons().CopyTo(controllerInput, 0);
                 bool[] povState = new bool[4] { false, false, false, false };
 
@@ -658,7 +663,7 @@ private void joystickTimer_Tick(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                Log.Write(ex.ToString());
+                //Log.Write(ex.ToString());
             }
         }
     }

diff --git a/station-submissions.xml b/station-submissions.xml
@@ -4,6 +4,11 @@
         <title>ETS Local Radio station submissions</title>
         <link>http://koenvh.nl/submit-station</link>
         <description>The station submissions feed, this feed shows all the stations submissions are their status.</description>
+        <item>
+            <title>List not always updated</title>
+            <link>javascript:;</link>
+            <description>There have been quite a few mutations without feed update... Sorry for that.</description>
+        </item>
         <item>
             <title>Rejected Radio Banovina</title>
             <link>javascript:;</link>

diff --git a/web/lib/js/main.js b/web/lib/js/main.js
@@ -1,5 +1,5 @@
 //current version:
-var version = "1.5.0";
+var version = "1.5.1";
 //current language set in ETS2 Local Radio server:
 var g_language = "en-GB";
 //language data:

diff --git a/web/stations/images-europe/austria/ORF Ö2.png b/web/stations/images-europe/austria/ORF Ö2.png
diff --git a/web/stations/images-europe/france/Radio Vinci Autoroutes.gif b/web/stations/images-europe/france/Radio Vinci Autoroutes.gif
diff --git a/web/stations/images-europe/latvia/Latvijas Kristīgais Radio.png b/web/stations/images-europe/latvia/Latvijas Kristīgais Radio.png
diff --git a/web/stations/stations-europe.js b/web/stations/stations-europe.js
@@ -39,6 +39,11 @@ var stations = {
             logo: "stations/images-europe/austria/ORF Ö1.png",
             url: "http://mp3stream3.apasf.apa.at:8000/;"
         },
+        {
+            name: "ORF Ö2 (Wien)",
+            logo: "stations/images-europe/austria/ORF Ö2.png",
+            url: "http://mp3stream2.apasf.apa.at:8000/;"
+        },
         {
             name: "ORF Ö3",
             logo: "stations/images-europe/austria/ORF Ö3.png",
@@ -620,6 +625,11 @@ var stations = {
             logo: "stations/images-europe/france/Radio Nova.png",
             url: "http://novazz.ice.infomaniak.ch/novazz-128.mp3"
         },
+        {
+            name: "Radio Vinci Autoroutes",
+            logo: "stations/images-europe/france/Radio Vinci Autoroutes.gif",
+            url: "http://str0.creacast.com/radio_vinci_autoroutes_6"
+        },
         {
             name: "Rire et Chansons",
             logo: "stations/images-europe/france/Rire et Chansons.png",
@@ -1181,6 +1191,11 @@ var stations = {
             logo: "stations/images-europe/latvia/EHR Superhits.png",
             url: "http://stream.europeanhitradio.com:8000/Stream_21.mp3"
         },
+        {
+            name: "Latvijas Kristīgais Radio",
+            logo: "stations/images-europe/latvia/Latvijas Kristīgais Radio.png",
+            url: "http://91.203.71.10:8006/;"
+        },
         {
             name: "Radio Skonto",
             logo: "stations/images-europe/latvia/Radio Skonto.png",