Synchronise with official 0.9.6.13

ayan4m1 · Jan 12, 2013 · 75ad3f5 · 75ad3f5
1 parent 198b3f4
commit 75ad3f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/Hive/Source/HiveExt/Resource.rc b/Hive/Source/HiveExt/Resource.rc
diff --git a/Hive/Source/HiveLib/HiveExtApp.cpp b/Hive/Source/HiveLib/HiveExtApp.cpp
@@ -1044,15 +1044,22 @@ Sqf::Value HiveExtApp::changeTableAccess( Sqf::Parameters params )
 
 	//then apply the changes
 	Sqf::Parameters failedAdd, failedRem;
-	for (auto it=allowTables.begin(); it!=allowTables.end(); ++it)
+	try
 	{
-		if (!_customData->allowTable(*it))
-			failedAdd.push_back(*it);
+		for (auto it=allowTables.begin(); it!=allowTables.end(); ++it)
+		{
+			if (!_customData->allowTable(*it))
+				failedAdd.push_back(*it);
+		}
+		for (auto it=removeTables.begin(); it!=removeTables.end(); ++it)
+		{
+			if (!_customData->removeAllowedTable(*it))
+				failedRem.push_back(*it);
+		}
 	}
-	for (auto it=removeTables.begin(); it!=removeTables.end(); ++it)
+	catch (const CustomDataSource::DataException& e)
 	{
-		if (!_customData->removeAllowedTable(*it))
-			failedRem.push_back(*it);
+		return ReturnBooleanStatus(false,e.toString());
 	}
 
 	Sqf::Parameters retVal;