fix merge issues, make console window work again

1 files changed, 1 insertions, 0 deletions

diff --git a/main.cpp b/main.cpp
index 7c82d6d8..4239d70f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -72,6 +72,7 @@ private slots:
 		//if (instance->getShowConsole())
 		console->show();
 		connect(proc, SIGNAL(ended()), SLOT(onTerminated()));
+		connect(proc, SIGNAL(log(QString,MessageLevel::Enum)), console, SLOT(write(QString,MessageLevel::Enum)));
 		proc->launch();
 	}