Sync

aaronspindler · Oct 14, 2014 · feb8e94 · feb8e94
1 parent f33970d
commit feb8e94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/FRC_Scouting_V2/FRC_Scouting_V2.csproj b/FRC_Scouting_V2/FRC_Scouting_V2.csproj
@@ -228,13 +228,9 @@
     <Resource Include="Resources\FRC_Logo_ICO.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="DLLs\Newtonsoft.Json.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <Content Include="DLLs\Newtonsoft.Json.dll" />
     <Content Include="FRC_Logo_ICO.ico" />
-    <Content Include="DLLs\MySql.Data.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <Content Include="DLLs\MySql.Data.dll" />
     <Content Include="Information Files\To-Do.txt" />
     <Resource Include="Resources\FRC340.png" />
     <Resource Include="Resources\FRC191.png" />

diff --git a/FRC_Scouting_V2/MainSettings.cs b/FRC_Scouting_V2/MainSettings.cs
@@ -351,6 +351,7 @@ private void testConnectionToDatabaseButton_Click(object sender, EventArgs e)
             }
             catch (MySqlException ex)
             {
+                connectionDisplay.BackColor = Color.Red;
                 Console.WriteLine("Error Code: " + ex.ErrorCode);
                 Console.WriteLine(ex.Message);
                 us.ErrorOccured(