[sword-svn] r75 - trunk/src/gui

[dtrotzjr at www.crosswire.org]

Author: dtrotzjr
Date: 2007-12-23 16:04:36 -0700 (Sun, 23 Dec 2007)
New Revision: 75

Modified:
   trunk/src/gui/Main.cpp
   trunk/src/gui/SimpleNavigator.cpp
Log:
Fixed memory error when exiting. SimpleNavigator->options was being deleted incorrectly.

Modified: trunk/src/gui/Main.cpp
===================================================================
--- trunk/src/gui/Main.cpp	2007-12-23 22:07:54 UTC (rev 74)
+++ trunk/src/gui/Main.cpp	2007-12-23 23:04:36 UTC (rev 75)
@@ -303,4 +303,4 @@
 
 namespace sword {
 	char *SWBuf::nullStr = "";
-}
\ No newline at end of file
+}

Modified: trunk/src/gui/SimpleNavigator.cpp
===================================================================
--- trunk/src/gui/SimpleNavigator.cpp	2007-12-23 22:07:54 UTC (rev 74)
+++ trunk/src/gui/SimpleNavigator.cpp	2007-12-23 23:04:36 UTC (rev 75)
@@ -54,8 +54,9 @@
 	delete verses;
 	delete text;
 	delete find;
-	if (options)
-		delete options;
+	if (options){
+		delete [] options;
+	}
 }
 
 void SimpleNavigator::refresh() {
@@ -144,7 +145,7 @@
 void SimpleNavigator::fillGlobalOptionsMenu(HMENU menuOptions) {
 	if (menuOptions) {
 		if (options)
-			delete options;
+			delete [] options;
 		optStartID = nextID;
 		this->menuOptions=menuOptions;
 		StringList optionNames = position.manager->getGlobalOptions();