From b9be6eba5f5302e413d5e170b32975da2b7bc0b3 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sat, 3 Jul 2010 23:33:31 +0000 Subject: [PATCH] Fix a crash on shutdown --- src/ui/mainwindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 247daecf6..7bd3351f7 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -541,8 +541,12 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg MainWindow::~MainWindow() { SaveGeometry(); - delete ui_; + + // It's important that the device manager is deleted before the database. + // Deleting the database deletes all objects that have been created in its + // thread, including some device library backends. + delete devices_; devices_ = NULL; } void MainWindow::ReloadSettings() {