From: Mikko Keinänen <mikko.keinanen@gmail.com>
Date: Wed, 17 Nov 2010 22:43:47 +0000 (+0200)
Subject: Exception handling.
X-Git-Url: http://vcs.maemo.org/git/?p=emufront;a=commitdiff_plain;h=2bc7c21e72e426d6fc5e28cb32f43896f4c9ca4f

Exception handling.
---

diff --git a/src/db/databasemanager.cpp b/src/db/databasemanager.cpp
index 448f271..faca76e 100644
--- a/src/db/databasemanager.cpp
+++ b/src/db/databasemanager.cpp
@@ -138,7 +138,7 @@ EmuFrontObject* DatabaseManager::getFilteredDataObject()
     }
      return plf;
 }
-
+/* Throws EmuFrontException */
 EmuFrontObject* DatabaseManager::getDataObjectFromModel(QModelIndex *index)
 {
     if (!sqlTableModel) sqlTableModel = getDataModel();
diff --git a/src/dialogs/dbobjectdialog.cpp b/src/dialogs/dbobjectdialog.cpp
index a87c9a5..db01ba4 100644
--- a/src/dialogs/dbobjectdialog.cpp
+++ b/src/dialogs/dbobjectdialog.cpp
@@ -111,7 +111,9 @@ void DbObjectDialog::editObject()
         createEditDialog();
     }
     deleteCurrentObject();
-    dbObject = dbManager->getDataObjectFromModel(&index);
+    try {
+        dbObject = dbManager->getDataObjectFromModel(&index);
+    } catch (EmuFrontException &e) { errorMessage->showMessage(e.what()); }
     activateNameDialog();
     nameDialog->setDataObject(dbObject);
 }
diff --git a/src/dialogs/mediaimagepathmaindialog.cpp b/src/dialogs/mediaimagepathmaindialog.cpp
index 1ba8a02..106bfff 100644
--- a/src/dialogs/mediaimagepathmaindialog.cpp
+++ b/src/dialogs/mediaimagepathmaindialog.cpp
@@ -71,11 +71,11 @@ void MediaImagePathMainDialog::beginScanFilePath()
             return;
         }
     FileUtil fileUtil(this);
-    EmuFrontObject *ob = dbManager->getDataObjectFromModel(&index);
-    if (!ob) return;
-    FilePathObject *fpo = dynamic_cast<FilePathObject*>(ob);
     try
     {
+        EmuFrontObject *ob = dbManager->getDataObjectFromModel(&index);
+        if (!ob) return;
+        FilePathObject *fpo = dynamic_cast<FilePathObject*>(ob);
         QStringList l;
         l << "*.zip"; // TODO set filters in a global constant class