segfault fixes

1 files changed, 18 insertions, 8 deletions

diff --git a/src/ui.cpp b/src/ui.cpp
index 8d57c36..a37a97c 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -398,20 +398,30 @@ namespace ui {
 		*/
 		
 		while(dialogOptCount){
-			if(dialogOptText[dialogOptCount])
+			if(dialogOptText[dialogOptCount]){
 				delete[] dialogOptText[dialogOptCount];	//free(dialogOptText[dialogOptCount]);
+				dialogOptText[dialogOptCount] = NULL;
+			}
 			dialogOptCount--;
 		};
+
 		dialogOptChosen=0;
 		dialogOptCount=0;
 		
-		soptbuf = new char[strlen(opt)+1];
-		
-		sopt=strtok(soptbuf,":");
-		while(sopt != NULL){
-			dialogOptText[dialogOptCount] = new char[strlen(sopt)+1];	//(char *)malloc(strlen(sopt));
-			strcpy(dialogOptText[dialogOptCount++],sopt);
-			sopt=strtok(NULL,":");
+		if(opt){
+			
+			soptbuf = new char[strlen(opt)+1];
+			strcpy(soptbuf,opt);
+			
+			sopt=strtok(soptbuf,":");
+			while(sopt != NULL){
+				dialogOptText[dialogOptCount] = new char[strlen(sopt)+1];	//(char *)malloc(strlen(sopt));
+				strcpy(dialogOptText[dialogOptCount++],sopt);
+				sopt=strtok(NULL,":");
+			}
+			
+			delete[] soptbuf;
+
 		}
 		
 		/*