Merge branch 'master' into trimming

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

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 6c7da4610c9230752043f9b1bcd122794071738a..2a995bee8d79b88fd478d6a8a523b0c74913a6ba 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -463,9 +463,10 @@ setup_i18n ()
        ofstream f ("c:/users/carl hetherington/foo", std::ios::app);
        f << "Hello.\n";
 
-       if (Config::instance()->language()) {
-               f << "Configured language " << Config::instance()->language().get() << "\n";
-               wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get()));
+       boost::optional<string> config_lang = Config::instance()->language ();
+       if (config_lang && !config_lang->empty ()) {
+               f << "Configured language " << config_lang.get() << "\n";
+               wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (config_lang.get ()));
                f << "LanguageInfo " << li << "\n";
                if (li) {
                        language = li->Language;