Merge pull request #5319 from SickheadGames/misc2

Misc Pipeline Fix
MonoGame · Nov 28, 2016 · fe5af5f · fe5af5f
2 parents 647fddc + 84e4184
commit fe5af5f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/MonoGame.Framework.Content.Pipeline/Processors/FontDescriptionProcessor.cs b/MonoGame.Framework.Content.Pipeline/Processors/FontDescriptionProcessor.cs
@@ -90,7 +90,7 @@ public FontDescriptionProcessor()
             // Get the platform specific texture profile.
             var texProfile = TextureProfile.ForPlatform(context.TargetPlatform);
 
-			try {
+            {
 				if (!File.Exists(fontName)) {
 					throw new Exception(string.Format("Could not load {0}", fontName));
 				}
@@ -133,9 +133,6 @@ public FontDescriptionProcessor()
 
                 output.Texture.Faces[0].Add(face);            
 			}
-			catch(Exception ex) {
-				context.Logger.LogImportantMessage("{0}", ex.ToString());
-			}
 
             if (PremultiplyAlpha)
             {

diff --git a/Tools/MGCB/ConsoleLogger.cs b/Tools/MGCB/ConsoleLogger.cs
@@ -30,7 +30,12 @@ public override void LogWarning(string helpLink, ContentIdentity contentIdentity
                     warning += "(" + contentIdentity.FragmentIdentifier + ")";
                 warning += ": ";
             }
-            warning += string.Format(message, messageArgs);
+
+            if (messageArgs != null && messageArgs.Length != 0)
+                warning += string.Format(message, messageArgs);
+            else if (!string.IsNullOrEmpty(message))
+                warning += message;
+
             Console.WriteLine(warning);
         }
     }