fixed null data model object

diff --git a/src/db/databasemanager.cpp b/src/db/databasemanager.cpp
index 235d6fd..591f097 100644 (file)
--- a/src/db/databasemanager.cpp
+++ b/src/db/databasemanager.cpp
@@ -108,6 +108,7 @@ EmuFrontObject* DatabaseManager::getDataObject(int id)
 
 EmuFrontObject* DatabaseManager::getDataObjectFromModel(QModelIndex *index)
 {
+    if (!sqlTableModel) sqlTableModel = getDataModel();
     QSqlRecord record = sqlTableModel->record(index->row());
     return recordToDataObject(&record);
 }

diff --git a/src/db/dbquerymodelmanager.cpp b/src/db/dbquerymodelmanager.cpp
index 8ec50bb..63451a5 100644 (file)
--- a/src/db/dbquerymodelmanager.cpp
+++ b/src/db/dbquerymodelmanager.cpp
@@ -28,6 +28,7 @@ DbQueryModelManager::DbQueryModelManager(QObject *parent)
 
 void DbQueryModelManager::filterById(int id)
 {
+    if (!sqlTableModel) sqlTableModel = getDataModel();
     sqlTableModel->setQuery(constructSelectById(id));
 }
 

diff --git a/src/dialogs/mediaimagepathmaindialog.cpp b/src/dialogs/mediaimagepathmaindialog.cpp
index 00afc0c..ba81068 100644 (file)
--- a/src/dialogs/mediaimagepathmaindialog.cpp
+++ b/src/dialogs/mediaimagepathmaindialog.cpp
@@ -57,8 +57,8 @@ void MediaImagePathMainDialog::initEditDialog()
 void MediaImagePathMainDialog::beginScanFilePath()
 {
     QModelIndex index = objectList->currentIndex();
-    FileUtil fileUtil(this);
     if (!index.isValid()) return;
+    FileUtil fileUtil(this);
     EmuFrontObject *ob = dbManager->getDataObjectFromModel(&index);
     if (!ob) return;
     FilePathObject *fpo = dynamic_cast<FilePathObject*>(ob);