summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-15 00:20:56 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-15 00:20:56 +0100
commit2cc70328d69fab3b08b368e3a2a93ab73c9fba16 (patch)
tree4da5864ccd5acd559cc03afc3777f012013b683e /src/tools
parent2f7e3fdd01f8951e6798b757aad45f5e287af161 (diff)
Try to fix problems with empty configured language.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dvdomatic.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 6c7da4610..2dc4c4de1 100644
--- 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;