[sword-cvs] biblecs bookmarkfrm.cpp,1.7,1.8 mainfrm.cpp,1.127,1.128

[sword@www.crosswire.org]

Update of /cvs/core/biblecs
In directory www:/tmp/cvs-serv20632

Modified Files:
	bookmarkfrm.cpp mainfrm.cpp 
Log Message:
no message

Index: bookmarkfrm.cpp
===================================================================
RCS file: /cvs/core/biblecs/bookmarkfrm.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bookmarkfrm.cpp	27 Jun 2003 11:31:41 -0000	1.7
+++ bookmarkfrm.cpp	24 Dec 2003 22:29:02 -0000	1.8
@@ -29,7 +29,7 @@
 	
 	bmtree->Items->Clear();
 
-	if ((sit = Form1->optionsconf->Sections.find("Bookmarks")) != Form1->optionsconf->Sections.end())
+	if (Form1 && Form1->optionsconf && ((sit = Form1->optionsconf->Sections.find("Bookmarks")) != Form1->optionsconf->Sections.end()))
 		bmdir = ((eit = (*sit).second.find("Directory")) != (*sit).second.end()) ? (*eit).second : (SWBuf)"";
 		
 //	Add Personal Bookmarks first, or if they don't exist, ADD A BLANK BRANCH first in the tree

Index: mainfrm.cpp
===================================================================
RCS file: /cvs/core/biblecs/mainfrm.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- mainfrm.cpp	15 Jul 2003 22:45:35 -0000	1.127
+++ mainfrm.cpp	24 Dec 2003 22:29:02 -0000	1.128
@@ -1702,7 +1702,7 @@
 				SWBuf type = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["type"].c_str();
 				SWBuf body = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["body"].c_str();
 				DefaultVSKey->Verse(oldVerse);
-				if (type == "crossReference") {
+				if ((type == "crossReference") || (clickText.c_str()[1] == 'x')) {
 					SWBuf refList = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["refList"].c_str();
 					tmpVerseList = DefaultVSKey->ParseVerseList(refList.c_str(), *DefaultVSKey);
 					if (tmpVerseList.Count())
@@ -2413,7 +2413,7 @@
 					body = module->RenderText(body.c_str());
 					DefaultVSKey->Verse(oldVerse);
  
-					if ((type == "crossReference")
+					if ((type == "crossReference") || (verseList.c_str()[1] == 'x')
 					// this doesn't work cuz we never cat into the hint code if a meta key is pressed.  curious.
 					// && (!GetAsyncKeyState(VK_LCONTROL))
 					) {