From bcfb437302d83a2b2225ff0849513c66d6644827 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Tue, 9 Feb 2016 15:06:55 +0100
Subject: [PATCH] - fixed message output.

---
 src/p_terrain.cpp      |  2 +-
 src/win32/st_start.cpp | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/p_terrain.cpp b/src/p_terrain.cpp
index d30354c1e..9d0b8456a 100644
--- a/src/p_terrain.cpp
+++ b/src/p_terrain.cpp
@@ -635,11 +635,11 @@ static void ParseFloor (FScanner &sc)
 
 	if (!picnum.Exists())
 	{
-		sc.MustGetString();
 		if (!opt)
 		{
 			Printf("Unknown flat %s\n", sc.String);
 		}
+		sc.MustGetString();
 		return;
 	}
 	sc.MustGetString ();
diff --git a/src/win32/st_start.cpp b/src/win32/st_start.cpp
index 52c95d69b..69e00f586 100644
--- a/src/win32/st_start.cpp
+++ b/src/win32/st_start.cpp
@@ -688,13 +688,16 @@ FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr)
 	LayoutMainWindow (Window, NULL);
 	InvalidateRect (StartupScreen, NULL, TRUE);
 
-	if (DoomStartupInfo.Song.IsNotEmpty())
+	if (!batchrun)
 	{
-		S_ChangeMusic(DoomStartupInfo.Song.GetChars(), true, true);
-	}
-	else
-	{
-		S_ChangeMusic ("orb", true, true);
+		if (DoomStartupInfo.Song.IsNotEmpty())
+		{
+			S_ChangeMusic(DoomStartupInfo.Song.GetChars(), true, true);
+		}
+		else
+		{
+			S_ChangeMusic("orb", true, true);
+		}
 	}
 	hr = S_OK;
 }