Added null checks.

diff --git a/src/dataobjects/emufrontobject.cpp b/src/dataobjects/emufrontobject.cpp
index 4dd7cae..f3f1774 100644 (file)
--- a/src/dataobjects/emufrontobject.cpp
+++ b/src/dataobjects/emufrontobject.cpp
@@ -49,7 +49,7 @@ EmuFrontObject& EmuFrontObject::operator =(const EmuFrontObject &ob)
 
 bool EmuFrontObject::operator ==(const EmuFrontObject &sup)
 {
-    return (id >= 0 && id == sup.id && name == sup.name);
+    return (id >= 0 && id == sup.id);
 }
 
 bool EmuFrontObject::operator !=(const EmuFrontObject &sup)

diff --git a/src/dialogs/executableeditdialog.cpp b/src/dialogs/executableeditdialog.cpp
index 442d6c6..c62fe9f 100644 (file)
--- a/src/dialogs/executableeditdialog.cpp
+++ b/src/dialogs/executableeditdialog.cpp
@@ -99,7 +99,7 @@ void ExecutableEditDialog::acceptChanges()
         }
         bool change = false;
         Setup *supTmp = ex->getSetup();
-        if (*supTmp != *su) {
+        if (!supTmp || *supTmp != *su) {
             delete supTmp;
             ex->setSetup(su);
             change = true;

diff --git a/src/dialogs/mediaimagepathdialog.cpp b/src/dialogs/mediaimagepathdialog.cpp
index 5aaab3a..0a6617e 100644 (file)
--- a/src/dialogs/mediaimagepathdialog.cpp
+++ b/src/dialogs/mediaimagepathdialog.cpp
@@ -134,7 +134,7 @@ void MediaImagePathDialog::acceptChanges()
     int idSup = sup->getId();
     int idTmp = tmp->getId();
 
-    if (*sup != *tmp)
+    if (!tmp || *sup != *tmp)
     {
         delete tmp;
         fpo->setSetup(sup);

diff --git a/src/dialogs/setupeditdialog.cpp b/src/dialogs/setupeditdialog.cpp
index e687bf9..049512f 100644 (file)
--- a/src/dialogs/setupeditdialog.cpp
+++ b/src/dialogs/setupeditdialog.cpp
@@ -87,14 +87,14 @@ void SetupEditDialog::acceptChanges()
 
     bool change = false;
     Platform *ptmp = sup->getPlatform();
-    if (*plf != *ptmp)
+    if (!ptmp || *plf != *ptmp)
     {
         delete ptmp;
         sup->setPlatform(plf);
         change = true;
     }
     MediaType *mtmp = sup->getMediaType();
-    if (*mt != *mtmp)
+    if (!mtmp || *mt != *mtmp)
     {
         delete mtmp;
         sup->setMediaType(mt);