3 files changed, 12 insertions, 0 deletions
diff --git a/api/logic/launch/LaunchTask.cpp b/api/logic/launch/LaunchTask.cpp
index 9df5f85a..23c28f50 100644
--- a/api/logic/launch/LaunchTask.cpp
+++ b/api/logic/launch/LaunchTask.cpp
@@ -209,6 +209,12 @@ shared_qobject_ptr<LogModel> LaunchTask::getLogModel()
 	if(!m_logModel)
 	{
 		m_logModel.reset(new LogModel());
+		m_logModel->setMaxLines(m_instance->getConsoleMaxLines());
+		m_logModel->setStopOnOverflow(m_instance->shouldStopOnConsoleOverflow());
+		// FIXME: should this really be here?
+		m_logModel->setOverflowMessage(tr("MultiMC stopped watching the game log because the log length surpassed %1 lines.\n"
+			"You may have to fix your mods because the game is still logging to files and"
+			" likely wasting harddrive space at an alarming rate!").arg(m_logModel->getMaxLines()));
 	}
 	return m_logModel;
 }
diff --git a/api/logic/launch/LogModel.cpp b/api/logic/launch/LogModel.cpp
index 579aa654..042feeab 100644
--- a/api/logic/launch/LogModel.cpp
+++ b/api/logic/launch/LogModel.cpp
@@ -133,6 +133,11 @@ void LogModel::setMaxLines(int maxLines)
 	m_maxLines = maxLines;
 }
 
+int LogModel::getMaxLines()
+{
+	return m_maxLines;
+}
+
 void LogModel::setStopOnOverflow(bool stop)
 {
 	m_stopOnOverflow = stop;
diff --git a/api/logic/launch/LogModel.h b/api/logic/launch/LogModel.h
index 558242d8..57cd23b0 100644
--- a/api/logic/launch/LogModel.h
+++ b/api/logic/launch/LogModel.h
@@ -21,6 +21,7 @@ public:
 
 	QString toPlainText();
 
+	int getMaxLines();
 	void setMaxLines(int maxLines);
 	void setStopOnOverflow(bool stop);
 	void setOverflowMessage(const QString & overflowMessage);