summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/interpreter/IMain.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/scala/tools/nsc/interpreter/IMain.scala')
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/IMain.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
index d6ef04dbc1..af70e74526 100644
--- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
@@ -238,7 +238,7 @@ class IMain(val settings: Settings, protected val out: JPrintWriter) extends Imp
/** Create a line manager. Overridable. */
protected def createLineManager(): Line.Manager =
- if (replProps.noThreads) null else new Line.Manager
+ if (ReplPropsKludge.noThreadCreation(settings)) null else new Line.Manager
/** Instantiate a compiler. Overridable. */
protected def newCompiler(settings: Settings, reporter: Reporter) = {
@@ -910,7 +910,7 @@ class IMain(val settings: Settings, protected val out: JPrintWriter) extends Imp
/** load and run the code using reflection */
def loadAndRun: (String, Boolean) = {
- if (replProps.noThreads) return {
+ if (lineManager == null) return {
try { ("" + (lineRep call sessionNames.print), true) }
catch { case ex => (lineRep.bindError(ex), false) }
}