Merge branch 'develop'

arttuka · Sep 4, 2017 · 5ce1ea9 · 5ce1ea9
2 parents 7b920e4 + 9d56a70
commit 5ce1ea9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mtg-pairings-win/MtgPairings/MtgPairings.sln b/mtg-pairings-win/MtgPairings/MtgPairings.sln
@@ -15,8 +15,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{86CFDBF2-7695-400F-9812-4654B89A5541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86CFDBF2-7695-400F-9812-4654B89A5541}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86CFDBF2-7695-400F-9812-4654B89A5541}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{86CFDBF2-7695-400F-9812-4654B89A5541}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{86CFDBF2-7695-400F-9812-4654B89A5541}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86CFDBF2-7695-400F-9812-4654B89A5541}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F313F170-7294-4D69-9713-117A5B4129D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F313F170-7294-4D69-9713-117A5B4129D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F313F170-7294-4D69-9713-117A5B4129D4}.Release|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/mtg-pairings-win/MtgPairings/MtgPairings/MainWindow.xaml.cs b/mtg-pairings-win/MtgPairings/MtgPairings/MainWindow.xaml.cs
@@ -140,7 +140,7 @@ public void CheckTournaments()
                 }
                 if (!oldTournament.Equals(newTournament) || uploadAll)
                 {
-                    if (!oldTournament.Teams.SequenceEqual(newTournament.Teams))
+                    if (!oldTournament.Teams.SequenceEqual(newTournament.Teams) || !newTournament.Teams.IsEmpty && uploadAll)
                     {
                         UploadEvent e = new UploadEvent(() => _uploader.UploadTeams(newTournament.SanctionNumber, newTournament.Teams),
                                                         t.AutoUpload, newTournament, UploadEvent.Type.Teams, 0);