diff --git a/.gitignore b/.gitignore
index b18653b83..251af7de1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /src/obj
 /src/Test/bin
 /src/Test/obj
+/src/TestResults/*
 /src/UpdateAssemblyInfo/bin
 /src/UpdateAssemblyInfo/obj
 /src/Properties/AssemblyInfo.cs
diff --git a/src/Logic/Configuration.cs b/src/Logic/Configuration.cs
index 8470f74bf..774e3b321 100644
--- a/src/Logic/Configuration.cs
+++ b/src/Logic/Configuration.cs
@@ -203,8 +203,17 @@ namespace Nikse.SubtitleEdit.Logic
                         Instance._baseDir = Path.GetDirectoryName(a.Location);
                     else
                         Instance._baseDir = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-                    if (Instance._baseDir.StartsWith("C:\\SubtitleEdit\\Trunk\\src\\TestResults\\"))
-                        Instance._baseDir = @"C:\SubtitleEdit\Trunk\src\bin\Release";
+
+                    // C:\Data\subtitleedit\subtitleedit\src\TestResults
+                    string tag = @"\SubtitleEdit\src\TestResults\";
+                    int start = Instance._baseDir.ToLower().IndexOf(tag.ToLower());
+                    if (start > 0)
+                    {
+                        string s = Instance._baseDir.Substring(0, start + tag.Length - 12) + "bin\\Release";
+                        Instance._baseDir = s;
+                    }
+
+
                     if (Instance._baseDir.EndsWith("Test\\bin\\Release"))
                         Instance._baseDir = Instance._baseDir.Replace("Test\\bin\\Release", "bin\\Release");
                     if (!Instance._baseDir.EndsWith(Path.DirectorySeparatorChar.ToString()))