[Amis-vcs] SF.net SVN: amis: [2448] branches/amis3/AmisGuiMFC2/src/gui/dialogs/ PublicationSummaryDialog.cpp

[<dan...@us...>]

Revision: 2448
          http://amis.svn.sourceforge.net/amis/?rev=2448&view=rev
Author:   daniel_weck
Date:     2008-03-19 04:56:58 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------
fixed bug where publication summary list was out of sync with self-voicing audio
actually fixed a crash bug as well (null pointer exception)

Modified Paths:
--------------
    branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp

Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp	2008-03-19 11:38:47 UTC (rev 2447)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp	2008-03-19 11:56:58 UTC (rev 2448)
@@ -270,6 +270,8 @@
 	appendToList(p_list, features, mNavigableItems);
 	if (mpCurrentPage != NULL)
 		appendToList(p_list, curr_page, mpCurrentPage->getText()->getTextString());
+	else 
+		appendToList(p_list, curr_page, L"");
 	wvalue = L"TODO";
 	appendToList(p_list, curr_time, wvalue);
 	if (mpSectionName != NULL)
@@ -278,6 +280,9 @@
 		value.Format(_T("%d subsections and %d pages"), mNumSubsections, mNumPagesForSection);
 		wvalue = value;
 		appendToList(p_list, section_contents, wvalue);
+	} else {
+		appendToList(p_list, curr_section, L"");
+		appendToList(p_list, section_contents, L"");
 	}
 	value.Format(_T("%d"), mTocs);
 	wvalue = value;
@@ -527,9 +532,11 @@
 			
 			else if (p_var->getName().compare("CURRENT_PAGE") == 0)
 			{
-				amis::AudioNode * node = mpCurrentPage->getAudio(0);
 				if (mpCurrentPage != NULL) {
+					amis::AudioNode * node = mpCurrentPage->getAudio(0);
 					p_var->setContents(mpCurrentPage->getText()->getTextString(), (node != NULL ? node->clone() : NULL));
+				} else if (promptNotAvailable != NULL) {
+					p_var->setContents(promptNotAvailable->getContents()->clone());
 				}
 			} 
 			else if (p_var->getName().compare("CURRENT_TIME") == 0)
@@ -539,10 +546,12 @@
 
 			else if (p_var->getName().compare("CURRENT_SECTION_TITLE") == 0)
 			{
-				amis::AudioNode * node = mpSectionName->getAudio(0);
 				if (mpSectionName != NULL)
 				{
+					amis::AudioNode * node = mpSectionName->getAudio(0);
 					p_var->setContents(mpSectionName->getText()->getTextString(), (node != NULL ? node->clone() : NULL));
+				} else if (promptNotAvailable != NULL) {
+					p_var->setContents(promptNotAvailable->getContents()->clone());
 				}
 			} 
 			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.