From 1e3db639b1906fdb0a27ad66358ac05b64016181 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 11 Apr 2018 10:35:34 -0700
Subject: [PATCH] Better console log to file support

---
 src/QGCApplication.cc          | 1 +
 src/QmlControls/AppMessages.cc | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 2494d5ba1..6d4d797b5 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -335,6 +335,7 @@ void QGCApplication::_shutdown(void)
 QGCApplication::~QGCApplication()
 {
     // Place shutdown code in _shutdown
+    _app = NULL;
 }
 
 void QGCApplication::_initCommon(void)
diff --git a/src/QmlControls/AppMessages.cc b/src/QmlControls/AppMessages.cc
index dc9db5f07..fab8b7bd6 100644
--- a/src/QmlControls/AppMessages.cc
+++ b/src/QmlControls/AppMessages.cc
@@ -92,7 +92,8 @@ void AppLogModel::threadsafeLog(const QString message)
     insertRows(line, 1);
     setData(index(line), message, Qt::DisplayRole);
 
-    if (_logFile.fileName().isEmpty() && qgcApp()->logOutput()) {
+    if (qgcApp() && qgcApp()->logOutput() && _logFile.fileName().isEmpty()) {
+        qDebug() << _logFile.fileName().isEmpty() << qgcApp()->logOutput();
         QGCToolbox* toolbox = qgcApp()->toolbox();
         // Be careful of toolbox not being open yet
         if (toolbox) {
@@ -110,5 +111,6 @@ void AppLogModel::threadsafeLog(const QString message)
     if (_logFile.isOpen()) {
         QTextStream out(&_logFile);
         out << message << "\n";
+        _logFile.flush();
     }
 }
-- 
2.22.0