Added error if emulator launching fails. Removed deleting

data object from dbsetup.

diff --git a/src/db/dbsetup.cpp b/src/db/dbsetup.cpp
index 443e963..dcb6539 100644 (file)
--- a/src/db/dbsetup.cpp
+++ b/src/db/dbsetup.cpp
@@ -127,7 +127,7 @@ bool DbSetup::deleteDataObjectFromModel(QModelIndex */*index*/)
     return false;
 }
 
-bool DbSetup::deleteDataObject(int id) const
+/*bool DbSetup::deleteDataObject(int id) const
 {
     int c = countDataObjectRefs(id);
     if (c != 0)
@@ -137,7 +137,7 @@ bool DbSetup::deleteDataObject(int id) const
     q.prepare(QString("DELETE FROM setup WHERE id=:id"));
     q.bindValue(":id", id);
     return q.exec();
-}
+}*/
 
 QSqlQueryModel* DbSetup::getData()
 {

diff --git a/src/db/dbsetup.h b/src/db/dbsetup.h
index 83b9d9d..8c262b1 100644 (file)
--- a/src/db/dbsetup.h
+++ b/src/db/dbsetup.h
@@ -44,7 +44,7 @@ protected:
     virtual QString constructSelectById(int id) const;
     virtual QString constructFilterById(int id) const;
     virtual QString constructSelect(QString whereClause = "") const;
-    virtual bool deleteDataObject(int id) const;
+    //virtual bool deleteDataObject(int id) const;
 
 private:
     virtual QSqlQueryModel* getData();

diff --git a/src/emulauncher.cpp b/src/emulauncher.cpp
index 5991a36..86f9d1c 100644 (file)
--- a/src/emulauncher.cpp
+++ b/src/emulauncher.cpp
@@ -194,6 +194,15 @@ void EmuLauncher::launch(const Executable * ex, const MediaImageContainer * mic)
     // Executable and MediaImageContainer objects are no more needed:
     delete ex;
     delete mic;
-    if (!proc) proc = new QProcess(this); // This has to be done in the heap
+    if (!proc) {
+        proc = new QProcess(this); // This has to be done in the heap
+        connect(proc, SIGNAL(error(QProcess::ProcessError)), this, SLOT(processError()));
+    }
     proc->start(cmdWithParams, QIODevice::ReadOnly);
 }
+
+void EmuLauncher::processError()
+{
+    QMessageBox::warning(this, tr("Emulator"),
+        tr("Launching emulator failed with: ").append(proc->errorString()), QMessageBox::Ok );
+}

diff --git a/src/emulauncher.h b/src/emulauncher.h
index 3b346a6..3120f70 100644 (file)
--- a/src/emulauncher.h
+++ b/src/emulauncher.h
@@ -47,6 +47,7 @@ signals:
 private slots:
     void updateMediaImageContainers();
     void launchEmu();
+    void processError();
 
 private:
     QTableView *micTable;