[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.4.svn151842-1-13-gd383fa3

[Mirco Bauer]

The following commit has been merged in the master branch:
commit d383fa343ee709d494437d0e6e1d9be9c2e9a0e1
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Apr 25 18:28:12 2010 +0200

    Fixed another NRE when using the startup_files member

diff --git a/mcs/tools/csharp/repl.cs b/mcs/tools/csharp/repl.cs
index 2518f69..80c24cf 100644
--- a/mcs/tools/csharp/repl.cs
+++ b/mcs/tools/csharp/repl.cs
@@ -199,7 +199,7 @@ namespace Mono {
 
 		public int ReadEvalPrintLoop ()
 		{
-			if (startup_files != null && startup_files.Length == 0)
+			if (startup_files == null || startup_files.Length == 0)
 				InitTerminal ();
 
 			InitializeUsing ();
@@ -209,7 +209,7 @@ namespace Mono {
 			//
 			// Interactive or startup files provided?
 			//
-			if (startup_files.Length != 0)
+			if (startup_files != null && startup_files.Length != 0)
 				ExecuteSources (startup_files, false);
 			else
 				ReadEvalPrintLoopWith (GetLine);

-- 
mono