diff options
author | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
---|---|---|
committer | Weblate <42@minetest.ru> | 2013-05-13 18:19:51 +0200 |
commit | e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0 (patch) | |
tree | 79a5a18634069822b84b9c878d8d26742567c4a3 /src/guiConfigureWorld.cpp | |
parent | be96fa2fb884fca571b92f63d33e0c5a592a2aad (diff) | |
parent | 822723c2468ea763cdef447218059a5586e8e033 (diff) | |
download | minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.gz minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.tar.bz2 minetest-e0564d5de01dd26f7b4f4d188415f5cf5a47b5d0.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/guiConfigureWorld.cpp')
-rw-r--r-- | src/guiConfigureWorld.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/guiConfigureWorld.cpp b/src/guiConfigureWorld.cpp index b2debfbd2..f94ed7d17 100644 --- a/src/guiConfigureWorld.cpp +++ b/src/guiConfigureWorld.cpp @@ -407,14 +407,26 @@ bool GUIConfigureWorld::OnEvent(const SEvent& event) delete[] text; menu->drop(); - ModConfiguration modconf(m_wspec.path); - if(!modconf.isConsistent()) + try { - wchar_t* text = wgettext("Warning: Configuration not consistent. "); + ModConfiguration modconf(m_wspec.path); + if(!modconf.isConsistent()) + { + wchar_t* text = wgettext("Warning: Configuration not consistent. "); + GUIMessageMenu *menu = + new GUIMessageMenu(Environment, Parent, -1, m_menumgr, + text ); + delete[] text; + menu->drop(); + } + } + catch(ModError &err) + { + errorstream<<err.what()<<std::endl; + std::wstring text = narrow_to_wide(err.what()) + wgettext("\nCheck debug.txt for details."); GUIMessageMenu *menu = new GUIMessageMenu(Environment, Parent, -1, m_menumgr, - text ); - delete[] text; + text ); menu->drop(); } |