From bb95f333f15ace7c032bb5b5761b512b6fe2e84e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 8 Mar 2013 21:03:28 +0000
Subject: Numerous fixes to A/B mode so that at least it doesn't crash (#72).

---
 src/tools/dvdomatic.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/tools/dvdomatic.cc')

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 4874e6ef8..230e02c88 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -482,12 +482,16 @@ class App : public wxApp
 #ifdef DVDOMATIC_POSIX		
 		unsetenv ("UBUNTU_MENUPROXY");
 #endif		
-		
+
+		/* This needs to be before setup_i18n, as setup_i18n() will
+		   create a Config object, which needs Scalers to have
+		   been created.
+		*/
+		dvdomatic_setup ();
+
 		wxInitAllImageHandlers ();
 		setup_i18n ();
 		
-		dvdomatic_setup ();
-
 		if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
 			try {
 				film.reset (new Film (film_to_load));
-- 
cgit v1.2.3