From 02528316c5ccbe10464a3aeed12eef5637d2319b Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Sat, 2 Oct 2010 17:25:07 -0400
Subject: Fix error handling and bad SQL syntax

---
 src/modmanager_static.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/modmanager_static.cpp')

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index 7d4a31134..e5fceeac0 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -71,7 +71,16 @@ bool ModuleManager::Load(const std::string& name, bool defer, ModuleState* state
 {
 	modmap::iterator it = modlist->find(name);
 	if (it == modlist->end())
+	{
+		LastModuleError = "Module not found";
+		return false;
+	}
+	if (Modules.find(name) != Modules.end())
+	{
+		LastModuleError = "Module already loaded";
 		return false;
+	}
+
 	Module* mod = NULL;
 	try
 	{
-- 
cgit v1.3.1-10-gc9f91