diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-12 22:29:20 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-12 22:29:20 +0000 |
| commit | 2f7180555f2d8b727bde21613fc2474bb4f7664c (patch) | |
| tree | 791291da76fbcf31ce62f72d1a540b67ca20b4f3 /src/tools/dvdomatic.cc | |
| parent | 1895cfd9642f53dd4ea83e53a655f93c8a65b37e (diff) | |
| parent | 7d262f9be3a4c5d8da07dce42f7e2da708f6c7f4 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/tools/dvdomatic.cc')
| -rw-r--r-- | src/tools/dvdomatic.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index d08975061..084e0fff7 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -479,12 +479,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)); |