Numerous fixes to A/B mode so that at least it doesn't crash (#72).

[dcpomatic.git] / src / tools / dvdomatic.cc

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 4874e6ef856478406fe3571e5e49e52cc0dc2b3c..230e02c88f8e2f8a587257c5bb77be7fe040fdd5 100644 (file)
--- 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));