Fixed core.resetOutput(); method behaviour (Fix #750)

Calling this method should clearing the output file and Output window in Script Console.
Stellarium · Dec 23, 2019 · a8b3f90 · a8b3f90
1 parent 955d67e
commit a8b3f90
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/gui/ScriptConsole.cpp b/src/gui/ScriptConsole.cpp
@@ -199,7 +199,7 @@ void ScriptConsole::preprocessScript()
 void ScriptConsole::runScript()
 {
 	ui->tabs->setCurrentIndex(1);
-	ui->logBrowser->setHtml("");
+	ui->logBrowser->clear();
 
 	appendLogLine(QString("Starting script at %1").arg(QDateTime::currentDateTime().toString()));
 	if (!StelApp::getInstance().getScriptMgr().runScriptDirect(ui->scriptEdit->toPlainText(), ui->includeEdit->text()))
@@ -239,10 +239,17 @@ void ScriptConsole::appendLogLine(const QString& s)
 
 void ScriptConsole::appendOutputLine(const QString& s)
 {
-	QString html = ui->outputBrowser->toHtml();
-	html.replace(QRegExp("^\\s+"), "");
-	html += s;
-	ui->outputBrowser->setHtml(html);
+	if (s.isEmpty())
+	{
+		ui->outputBrowser->clear();
+	}
+	else
+	{
+		QString html = ui->outputBrowser->toHtml();
+		html.replace(QRegExp("^\\s+"), "");
+		html += s;
+		ui->outputBrowser->setHtml(html);
+	}
 }
 
 

diff --git a/src/scripting/StelScriptOutput.cpp b/src/scripting/StelScriptOutput.cpp
@@ -48,6 +48,7 @@ void StelScriptOutput::writeLog(QString msg)
 
 void StelScriptOutput::reset(void)
 {
+	outputFile.resize(0);
 	outputFile.reset();
 	outputText.clear();
 }