Merge branch 'maint-1.3'

# Conflicts: # src/swrenderer/plane/r_flatplane.cpp
ZDoom · Mar 12, 2017 · 1674aa8 · 1674aa8
2 parents cd40d96 + ece0862
commit 1674aa8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/d_main.cpp b/src/d_main.cpp
@@ -808,7 +808,7 @@ void D_Display ()
 			{
 				StatusBar->DrawBottomStuff (HUD_AltHud);
 				if (DrawFSHUD || automapactive) DrawHUD();
-				if (players[consoleplayer].camera && players[consoleplayer].camera->player)
+				if (players[consoleplayer].camera && players[consoleplayer].camera->player && !automapactive)
 				{
 					StatusBar->DrawCrosshair();
 				}