@@ -154,6 +154,11 @@ Application::Application(int& argc, char** argv) :
         }
     }
 
+    if(m_dontShowMainWindow) {
+        m_mainWindow = nullptr;
+        return;
+    }
+
     // Show main window
     m_mainWindow = new MainWindow();
     m_mainWindow->show();
@@ -188,7 +193,8 @@ Application::Application(int& argc, char** argv) :
 
 Application::~Application()
 {
-    delete m_mainWindow;
+    if(m_mainWindow)
+        delete m_mainWindow;
 }
 
 bool Application::event(QEvent* event)
 
@@ -1,14 +1,60 @@
 #include "Application.h"
+#include "sqlite.h"
+
+#include <QMessageBox>
+
+static QMessageBox* messageBox = nullptr;
+
+void db4sMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    QByteArray localMsg = msg.toLocal8Bit();
+
+    // Emulate the default Qt treatment. This might not work in some OS, like Windows.
+    fprintf(stderr, "%s\n", localMsg.constData());
+
+    const char *file = context.file ? context.file : "";
+    const char *function = context.function ? context.function : "";
+    localMsg = QString("%1 (%2, %3:%4)\n").arg(msg).arg(function).arg(file).arg(context.line).toLocal8Bit();
+
+    // Log using the SQLite log mechanism, so it gets the same treatment than messages
+    // reported by SQLite itself. This will allow these messages to be seen in our Log window.
+    // Error code will be the type
+    sqlite3_log(static_cast<int>(type), localMsg.constData());
+}
+
+void boxMessageOutput(QtMsgType, const QMessageLogContext &, const QString &msg)
+{
+    if (!messageBox)
+        messageBox = new QMessageBox();
+
+    messageBox->setText(messageBox->text() + msg + "\n");
+
+    if (!messageBox->isVisible())
+        messageBox->show();
+}
 
 int main( int argc, char ** argv )
 {
+
+#ifdef Q_OS_WIN
+    // In Windows, there is no output to terminal for a graphical application, so we install
+    // the output to message box, until the main window is shown or the application exits.
+    qInstallMessageHandler(boxMessageOutput);
+#endif
+
     // Create application object. All the initialisation stuff happens in there
     Application a(argc, argv);
 
+    // If there has been output in the message box, let user see it.
+    if(messageBox && messageBox->isVisible())
+        messageBox->exec();
+
     // Quit application now if user doesn't want to see the UI
     if(a.dontShowMainWindow())
         return 0;
 
+    qInstallMessageHandler(db4sMessageOutput);
+
     // Run application
     return a.exec();
 }
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,11 @@ Application::Application(int& argc, char** argv) :`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ if(m_dontShowMainWindow) {`
	`158`	`+ m_mainWindow = nullptr;`
	`159`	`+ return;`
	`160`	`+ }`
	`161`	`+`
`157`	`162`	`// Show main window`
`158`	`163`	`m_mainWindow = new MainWindow();`
`159`	`164`	`m_mainWindow->show();`
`@@ -188,7 +193,8 @@ Application::Application(int& argc, char** argv) :`
`188`	`193`
`189`	`194`	`Application::~Application()`
`190`	`195`	`{`
`191`		`- delete m_mainWindow;`
	`196`	`+ if(m_mainWindow)`
	`197`	`+ delete m_mainWindow;`
`192`	`198`	`}`
`193`	`199`
`194`	`200`	`bool Application::event(QEvent* event)`