Merge pull request #300 from mikfire/bugs/deletehopcore

Closes #116 - Crash at closing after deleting hop

src/MainWindow.cpp

@@ -1931,12 +1931,6 @@ void MainWindow::closeEvent(QCloseEvent* /*event*/)
    // cause any more queries.
    setVisible(false);
 
-   // Ask the user if they want to save changes, only if the dirty bit has
-   // been thrown
-   // We should also make sure the backup db still exists -- there's some edge
-   // cases where it doesn't.
-
-   Database::instance().unload();
 }
 
 void MainWindow::copyRecipe()

src/database.cpp

@@ -542,15 +542,14 @@ void Database::unload()
    // The postgres driver wants nothing to do with this. Core gets dumped if
    // we try it. Since we don't need to copy things about for postgres...
 
-   if ( Brewtarget::dbType() == Brewtarget::SQLITE ) {
 
-      QSqlDatabase::database( dbConName, false ).close();
-
-      QSqlDatabase::removeDatabase( dbConName );
+   QSqlDatabase::database( dbConName, false ).close();
+   QSqlDatabase::removeDatabase( dbConName );
 
+   if (loadWasSuccessful && Brewtarget::dbType() == Brewtarget::SQLITE )
+   {
       dbFile.close();
-      if (loadWasSuccessful)
-         automaticBackup();
+      automaticBackup();
    }
 }
 
@@ -663,6 +662,7 @@ void Database::dropInstance()
    static QMutex mutex;
 
    mutex.lock();
+   dbInstance->unload();
    delete dbInstance;
    dbInstance=0;
    mutex.unlock();