Fixed bug when clicking new and playing song. Modified log path and r…

…esources.
AugustoRuiz · Mar 19, 2016 · a866f40 · a866f40
1 parent 2e17138
commit a866f40
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 17 deletions.
diff --git a/WYZTracker.Core/Logger.cs b/WYZTracker.Core/Logger.cs
@@ -13,11 +13,12 @@ static Logger()
 
         public static string FileName { get; set; }
 
-        private static string logPath
+        public static string LogPath
         {
             get
             {
-                return System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), FileName);
+                return System.IO.Path.Combine(Environment.CurrentDirectory, FileName);
+                //return System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), FileName);
             }
         }
 
@@ -28,7 +29,7 @@ public static void Log(string format, params object[] parameters)
                 Environment.NewLine, 
                 string.Format(format, parameters));
 
-            System.IO.File.AppendAllText(logPath, finalText);
+            System.IO.File.AppendAllText(LogPath, finalText);
 #if DEBUG
             System.Diagnostics.Debug.WriteLine(finalText); 
 #endif

diff --git a/WYZTracker.Core/Player/PlaybackStreamer.cs b/WYZTracker.Core/Player/PlaybackStreamer.cs
@@ -48,8 +48,9 @@ public static bool IsAudioAvailable()
                 IList<string> devices = OpenTK.Audio.AudioContext.AvailableDevices;
                 result = true;
             }
-            catch 
+            catch (Exception e)
             {
+                Logger.Log(e.ToString());
             }
             return result;
         }

diff --git a/WYZTracker.Core/Player/Player.cs b/WYZTracker.Core/Player/Player.cs
@@ -321,7 +321,7 @@ private double[] getTick()
                 if (this.effectPosition >= 0)
                 {
                     this.effectPosition++;
-                    if (effectPosition >= this.currentEffect.Volumes.Length)
+                    if (this.currentEffect == null || effectPosition >= this.currentEffect.Volumes.Length)
                     {
                         effectPosition = int.MinValue;
                     }

diff --git a/WYZTracker/Program.cs b/WYZTracker/Program.cs
@@ -46,6 +46,8 @@ static void Main(string[] args)
                 {
                     Logger.Log(ex.ToString());
 
+                    string errorMessage = string.Format(WYZTracker.Properties.Resources.ApplicationError, Logger.LogPath);
+
                     MessageBox.Show(WYZTracker.Properties.Resources.ApplicationError,
                         WYZTracker.Properties.Resources.Error,
                         MessageBoxButtons.OK,
@@ -131,16 +133,24 @@ private static bool installOpenAL()
                 MessageBoxButtons.YesNo,
                 MessageBoxIcon.Error) == DialogResult.Yes)
             {
-                if (isMono)
+                try
                 {
-                    Process.Start("http://www.openal.org/creative-installers/");
+                    if (isMono)
+                    {
+                        Process.Start("http://www.openal.org/creative-installers/");
+                    }
+                    else
+                    {
+                        ProcessStartInfo pInfo = new ProcessStartInfo("oalinst.exe");
+                        Process setupProcess = Process.Start(pInfo);
+                        setupProcess.WaitForExit();
+                        result = true;
+                    }
                 }
-                else
+                catch (Exception e)
                 {
-                    ProcessStartInfo pInfo = new ProcessStartInfo("oalinst.exe");
-                    Process setupProcess = Process.Start(pInfo);
-                    setupProcess.WaitForExit();
-                    result = true;
+                    Logger.Log("OpenAL couldn't be installed properly.\nPlease install OpenAL before running WYZTracker.");
+                    Logger.Log(e.ToString());
                 }
             }
             return result;

diff --git a/WYZTracker/Properties/Resources.Designer.cs b/WYZTracker/Properties/Resources.Designer.cs
diff --git a/WYZTracker/Properties/Resources.de.resx b/WYZTracker/Properties/Resources.de.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ApplicationError" xml:space="preserve">
-    <value>Ein Fehler ist aufgetreten. Bitte reichen Sie die Datei [My Documents]\WYZTracker.log ein, an:
+    <value>Ein Fehler ist aufgetreten. Bitte reichen Sie die Datei {0} ein, an:
 augusto.ruiz@gmail.com.
 Vielen Dank!</value>
   </data>

diff --git a/WYZTracker/Properties/Resources.en.resx b/WYZTracker/Properties/Resources.en.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ApplicationError" xml:space="preserve">
-    <value>An error has occurred. Please, submit the file [My Documents]\WYZTracker.log to:
+    <value>An error has occurred. Please, submit the file {0} to:
 augusto.ruiz@gmail.com.
 Thank you!</value>
   </data>

diff --git a/WYZTracker/Properties/Resources.resx b/WYZTracker/Properties/Resources.resx
@@ -266,7 +266,7 @@
     <value>WYZTracker2 - {0}</value>
   </data>
   <data name="ApplicationError" xml:space="preserve">
-    <value>Se ha producido un error en la aplicación. Por favor, envíe el fichero [Mis Documentos]\WYZTracker.log a:
+    <value>Se ha producido un error en la aplicación. Por favor, envíe el fichero {0} a:
 augusto.ruiz@gmail.com.
 ¡Gracias!</value>
   </data>

diff --git a/bin/WYZTracker.2.0.0.0.7z b/bin/WYZTracker.2.0.0.0.7z
diff --git a/docs/imgs/efectos.png b/docs/imgs/efectos.png