Fixed exception into GameEvent.__getitem__.

L'In20Cible · L'In20Cible · commit 17ca2a1e0576 · 2017-01-19T18:21:53.000-05:00
diff --git a/src/core/modules/events/events.h b/src/core/modules/events/events.h
@@ -69,7 +69,7 @@ class IGameEventExt: public IGameEvent
 		}
 		catch(...)
 		{
-			KeyValues *field = ((IGameEventExt *)pEvent)->m_pDescriptor->keys->FindKey(item);
+			KeyValues *field = GetDescriptor(pEvent)->keys->FindKey(item);
 			if (field != NULL)
 			{
 				switch ((EventVarType)atoi(field->GetString()))
@@ -93,8 +93,8 @@ class IGameEventExt: public IGameEvent
 				}
 			}
 
-			if (return_value.ptr() == Py_None)
-				PyErr_Print();
+			if (return_value.ptr() == Py_None && PyErr_Occurred())
+				throw_error_already_set();
 
 			PyErr_Clear();
 		}

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class IGameEventExt: public IGameEvent`
`69`	`69`	`}`
`70`	`70`	`catch(...)`
`71`	`71`	`{`
`72`		`- KeyValues field = ((IGameEventExt )pEvent)->m_pDescriptor->keys->FindKey(item);`
	`72`	`+ KeyValues *field = GetDescriptor(pEvent)->keys->FindKey(item);`
`73`	`73`	`if (field != NULL)`
`74`	`74`	`{`
`75`	`75`	`switch ((EventVarType)atoi(field->GetString()))`
`@@ -93,8 +93,8 @@ class IGameEventExt: public IGameEvent`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (return_value.ptr() == Py_None)`
`97`		`- PyErr_Print();`
	`96`	`+ if (return_value.ptr() == Py_None && PyErr_Occurred())`
	`97`	`+ throw_error_already_set();`
`98`	`98`
`99`	`99`	`PyErr_Clear();`
`100`	`100`	`}`