Fix missing return in CScriptCallbackEx<void>::operator().

nitrocaster · nitrocaster · commit 56f85cc01548 · 2015-11-25T02:17:23.000+03:00
diff --git a/src/xrGame/script_callback_ex.h b/src/xrGame/script_callback_ex.h
@@ -182,7 +182,8 @@ void CScriptCallbackEx<void>::operator()(Args &&...args) const
                     VERIFY(m_object.is_valid());
                     luabind::call_function<void>(m_functor, m_object, std::forward<Args>(args)...);
                 }
-                luabind::call_function<void>(m_functor, std::forward<Args>(args)...);
+                else
+                    luabind::call_function<void>(m_functor, std::forward<Args>(args)...);
             }
         }
         process_error catch(std::exception &)
@@ -212,7 +213,8 @@ void CScriptCallbackEx<void>::operator()(Args &&...args)
                     VERIFY(m_object.is_valid());
                     luabind::call_function<void>(m_functor, m_object, std::forward<Args>(args)...);
                 }
-                luabind::call_function<void>(m_functor, std::forward<Args>(args)...);
+                else
+                    luabind::call_function<void>(m_functor, std::forward<Args>(args)...);
             }
         }
         process_error catch (std::exception &)

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,8 @@ void CScriptCallbackEx<void>::operator()(Args &&...args) const`
`182`	`182`	`VERIFY(m_object.is_valid());`
`183`	`183`	`luabind::call_function<void>(m_functor, m_object, std::forward<Args>(args)...);`
`184`	`184`	`}`
`185`		`- luabind::call_function<void>(m_functor, std::forward<Args>(args)...);`
	`185`	`+ else`
	`186`	`+ luabind::call_function<void>(m_functor, std::forward<Args>(args)...);`
`186`	`187`	`}`
`187`	`188`	`}`
`188`	`189`	`process_error catch(std::exception &)`
`@@ -212,7 +213,8 @@ void CScriptCallbackEx<void>::operator()(Args &&...args)`
`212`	`213`	`VERIFY(m_object.is_valid());`
`213`	`214`	`luabind::call_function<void>(m_functor, m_object, std::forward<Args>(args)...);`
`214`	`215`	`}`
`215`		`- luabind::call_function<void>(m_functor, std::forward<Args>(args)...);`
	`216`	`+ else`
	`217`	`+ luabind::call_function<void>(m_functor, std::forward<Args>(args)...);`
`216`	`218`	`}`
`217`	`219`	`}`
`218`	`220`	`process_error catch (std::exception &)`