From 2cc70328d69fab3b08b368e3a2a93ab73c9fba16 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2013 00:20:56 +0100 Subject: Try to fix problems with empty configured language. --- src/tools/dvdomatic.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/tools') 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 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; -- cgit v1.2.3