From 2f4a92d70192468096e35974f0725532aef837b1 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 3 Dec 2011 03:23:14 +0200
Subject: Better mod loading error handling

---
 src/main.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index c1b9d902b..83f532af1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -429,6 +429,7 @@ Doing currently:
 #include "settings.h"
 #include "profiler.h"
 #include "log.h"
+#include "mods.h"
 
 /*
 	Settings.
@@ -1662,6 +1663,11 @@ int main(int argc, char *argv[])
 			errorstream<<"Socket error (port already in use?)"<<std::endl;
 			error_message = L"Socket error (port already in use?)";
 		}
+		catch(ModError &e)
+		{
+			errorstream<<e.what()<<std::endl;
+			error_message = narrow_to_wide(e.what());
+		}
 #ifdef NDEBUG
 		catch(std::exception &e)
 		{
-- 
cgit v1.2.3