From a308f430f694423064ebc86fd0506c8c6fdb3d93 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Sun, 19 Apr 2015 22:30:21 -0400
Subject: Imported Upstream version 3.0.5

---
 SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp')

diff --git a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp
index d31d536..676009a 100644
--- a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp
@@ -929,10 +929,10 @@ void DbVersionConverter::fullConvertStep2()
     for (DbPlugin* plugin : PLUGINS->getLoadedPlugins<DbPlugin>())
     {
         tmpDb = plugin->getInstance("", ":memory:", QHash<QString,QVariant>());
-        if (tmpDb->initAfterCreated() && tmpDb->getDialect() == fullConversionConfig->to)
+        if (tmpDb && tmpDb->initAfterCreated() && tmpDb->getDialect() == fullConversionConfig->to)
             db = plugin->getInstance(fullConversionConfig->targetName, fullConversionConfig->targetFile, QHash<QString,QVariant>());
 
-        delete tmpDb;
+        safe_delete(tmpDb);
         if (db)
             break;
     }
@@ -1105,7 +1105,7 @@ QList<Db*> DbVersionConverter::getAllPossibleDbInstances() const
     for (DbPlugin* plugin : PLUGINS->getLoadedPlugins<DbPlugin>())
     {
         db = plugin->getInstance("", ":memory:", QHash<QString,QVariant>());
-        if (!db->initAfterCreated())
+        if (!db || !db->initAfterCreated())
             continue;
 
         dbList << db;
-- 
cgit v1.2.3