[sword-svn] r2225 - in trunk: . include src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2009-01-13 21:50:05 -0700 (Tue, 13 Jan 2009)
New Revision: 2225

Modified:
   trunk/configure.ac
   trunk/include/config.h
   trunk/src/mgr/localemgr.cpp
Log:
Fixed the infamous null pointer engine bug with GS and hopefully BT.
Upped version to allow detection of svn over released.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-01-10 23:25:03 UTC (rev 2224)
+++ trunk/configure.ac	2009-01-14 04:50:05 UTC (rev 2225)
@@ -5,7 +5,7 @@
 # Version change: Change line 8 only !
 # Change it immediately after a release
 
-AC_INIT(sword, 1.5.11, sword-bugs at crosswire.org)
+AC_INIT(sword, 1.5.11.99, sword-bugs at crosswire.org)
 AC_CONFIG_SRCDIR(sword.bmp)
 AC_PREREQ(2.52)
 AC_REVISION($Revision: 1.45 $)

Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2009-01-10 23:25:03 UTC (rev 2224)
+++ trunk/include/config.h	2009-01-14 04:50:05 UTC (rev 2225)
@@ -50,19 +50,19 @@
 #define PACKAGE_NAME "sword"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sword 1.5.11"
+#define PACKAGE_STRING "sword 1.5.11.99"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sword"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.11"
+#define PACKAGE_VERSION "1.5.11.99"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.5.11"
+#define VERSION "1.5.11.99"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

Modified: trunk/src/mgr/localemgr.cpp
===================================================================
--- trunk/src/mgr/localemgr.cpp	2009-01-10 23:25:03 UTC (rev 2224)
+++ trunk/src/mgr/localemgr.cpp	2009-01-14 04:50:05 UTC (rev 2225)
@@ -50,9 +50,7 @@
 
 LocaleMgr *LocaleMgr::getSystemLocaleMgr() {
 	if (!systemLocaleMgr) {
-		systemLocaleMgr = new LocaleMgr();
-		SWLocale *locale = new SWLocale(0);
-		systemLocaleMgr->locales->insert(LocaleMap::value_type(locale->getName(), locale));
+		setSystemLocaleMgr(new LocaleMgr());
 	}
 
 	return systemLocaleMgr;
@@ -63,6 +61,8 @@
 	if (systemLocaleMgr)
 		delete systemLocaleMgr;
 	systemLocaleMgr = newLocaleMgr;
+	SWLocale *locale = new SWLocale(0);
+	systemLocaleMgr->locales->insert(LocaleMap::value_type(locale->getName(), locale));
 }