Fixed more things... I'm starting to like MSVC! THAT'S NO GOOD!

1 files changed, 12 insertions, 8 deletions

diff --git a/cd-tool.cpp b/cd-tool.cpp
index 9facf0e..cf7578b 100644
--- a/cd-tool.cpp
+++ b/cd-tool.cpp
@@ -45,10 +45,14 @@ CODE_BEGINS
 public:
 Appli() : cdutil(0), iso_r(0), iso_w(0), file(0) {}
 virtual ~Appli() {
-    delete cdutil;
-    delete iso_r;
-    delete iso_w;
-    delete file;
+    if (cdutil)
+	delete cdutil;
+    if (iso_r)
+	delete iso_r;
+    if (iso_w)
+	delete iso_w;
+    if (file)
+	delete file;
 }
 private:
 
@@ -102,7 +106,7 @@ virtual int startup() throw (GeneralException) {
     if (argc == optind) {
 	showhelp();
 	printm(M_ERROR, "Need an iso filename to work on.\n");
-	throw Exit(-1);
+	exit(-1);
     }
     
     iso_name = argv[optind++];
@@ -110,7 +114,7 @@ virtual int startup() throw (GeneralException) {
     if (argc  == optind) {
 	showhelp();
 	printm(M_ERROR, "Need a command to execute.\n");
-	throw Exit(-1);
+	exit(-1);
     }
     
     iso_r = open_iso(iso_name);
@@ -118,7 +122,7 @@ virtual int startup() throw (GeneralException) {
     cdutil = new cdutils(iso_r);
     
     if (!cdutil->get_iso_infos())
-	throw Exit(-1);
+	exit(-1);
     
     if (!strcmp(argv[optind], "infos")) {
 	cdutil->show_iso_infos();
@@ -140,7 +144,7 @@ virtual int startup() throw (GeneralException) {
 	    throw Exit(-1);
 	}
 	if (!(dir.Flags & 2)) {
-	    printm(M_ERROR, "Path %s design a file and not a directory.\n", arg1);
+	    printm(M_ERROR, "Path %s is a file and not a directory.\n", arg1);
 	    throw Exit(-1);
 	}
 	cdutil->show_head_entry();