6 files changed, 31 insertions, 23 deletions
diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
index 6863fa0..d8adede 100644
--- a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
@@ -1,6 +1,6 @@
 object AboutBox: TAboutBox
-  Left = 296
-  Top = 109
+  Left = 313
+  Top = 111
   BorderStyle = bsDialog
   Caption = 'About The SWORD Project'
   ClientHeight = 448
diff --git a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp
index 54859d4..83a7940 100644
--- a/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp
@@ -110,7 +110,8 @@ signed char BibleCSMGR::Load () {
 };
 
 void BibleCSMGR::applyUserPrefs() {
-	(*config) += (*userPrefs);
+	if ((config) && (userPrefs))
+		(*config) += (*userPrefs);
 }
 
 void BibleCSMGR::AddGlobalOptions (SWModule * module, ConfigEntMap & section,
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index bc54534..e4eab26 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -964,8 +964,15 @@ void __fastcall TForm1::FormShow(TObject *Sender)
 	DefaultStrKey->Persist(1);
 	*DefaultStrKey = "";
 
-	mainmgr = new BibleCSMGR(ModInstFrm);
+	try {
+		mainmgr = new BibleCSMGR(ModInstFrm);
+	}
+	catch (...) {
+		Application->Terminate();
+	}
 
+	if (!mainmgr->config)
+		Application->Terminate();
 	// Load devotion and show form
 
 	for (it = mainmgr->Modules.begin(); it != mainmgr->Modules.end(); it++) {
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index ac9ee50..120e95b 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr
@@ -43,7 +43,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
     <INCLUDEPATH value="TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -55,16 +55,16 @@
     <IDLCFLAGS value="-I..\.. -I..\..\..\..\..\icu-sword\source\common 
       -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include 
       -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/>
-    <CFLAG1 value="-O2 -Vx -Ve -RT- -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn"/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
+    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -73,7 +73,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=5
 Release=4
-Build=130
+Build=131
 Debug=0
 PreRelease=0
 Special=0
@@ -85,7 +85,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=CrossWire Software &amp; Bible Society
 FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.4.130
+FileVersion=1.5.4.131
 InternalName=biblecs
 LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
 LegalTrademarks=
@@ -125,8 +125,8 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=8
-Item0=_ICU_;_ICUSWORD_;USBINARY
-Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY
 Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
 Item3=_ICU_;_ICUSWORD_;_DEBUG
 Item4=_ICU_;_ICUSWORD_
@@ -159,7 +159,7 @@ RemoteDebug=0
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
 
 [Language]
 ActiveLang=
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index 9adcbc3..4c24f8a 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res
diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
index 9978ead..a280a48 100644
--- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
@@ -78,7 +78,7 @@
     <DEBUGLIBPATH value=""/>
     <RELEASELIBPATH value=""/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
     <MAINSOURCE value="swordlib.cpp"/>
     <INCLUDEPATH value="..\InstallMgr\curl\include;..\..;..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook;..\..\..\..\src\modules\lexdict\zld;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..;..\..\..\..\utilfuns;..\..\..\framework;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\include;..\..\..\..\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -107,11 +107,11 @@
       -I..\..\..\..\src\modules\comments\rawcom -I..\..\..\..\src\mgr 
       -I..\..\..\..\src\keys -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix 
       cpp -D_ICU_ -D_DEBUG"/>
-    <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 
-      -4 -b- -k- -vi -c -g0 -tWM"/>
-    <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx 
+      -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -g0 -tWM"/>
+    <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y+ -$W -$O- -v -M -JPHNE"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
+    <AFLAGS value="/mx /w2 /zi"/>
     <LFLAGS value="/P512"/>
   </OPTIONS>
   <LINKER>
@@ -163,8 +163,8 @@ Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;..
 
 [HistoryLists\hlConditionals]
 Count=8
-Item0=_ICU_;_ICUSWORD_;USBINARY
-Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY
 Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
 Item3=_ICU_;_ICUSWORD_;_DEBUG
 Item4=_ICU_;_ICUSWORD_
@@ -200,7 +200,7 @@ RemoteDebug=0
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
 
 [Language]
 ActiveLang=