Improve script runtime delete

Author: FabianTerhorst

runtime/include/CSharpScriptRuntime.h

@@ -23,7 +23,9 @@ class CSharpScriptRuntime : public alt::IScriptRuntime
   public:
     CSharpScriptRuntime(alt::ICore* server);
 
-  private:
+    virtual ~CSharpScriptRuntime();
+
+private:
     alt::ICore *core;
     CoreClr* coreClr;
 };

runtime/include/CoreClr.h

@@ -121,8 +121,8 @@ class CoreClr {
                 void** runtimeHost,
                 const unsigned int* domainId);
 
-    void Shutdown(alt::ICore* server, void* runtimeHost,
-                  unsigned int domainId);
+    /*void Shutdown(alt::ICore* server, void* runtimeHost,
+                  unsigned int domainId);*/
 
     void GetPath(alt::ICore* server, const char* defaultPath);
 

runtime/src/CSharpResourceImpl.cpp

@@ -197,7 +197,6 @@ CSharpResourceImpl::CSharpResourceImpl(alt::ICore* server, CoreClr* coreClr, alt
 }
 
 bool CSharpResourceImpl::Start() {
-    alt::IResource::Impl::Start();
     coreClr->ExecuteManagedResource(server, this->resource->GetPath().CStr(), this->resource->GetName().CStr(), this->resource->GetMain().CStr(),
                                     this->resource);
     if (MainDelegate == nullptr) return false;
@@ -206,7 +205,6 @@ bool CSharpResourceImpl::Start() {
 }
 
 bool CSharpResourceImpl::Stop() {
-    alt::IResource::Impl::Stop();
     for (alt::Size i = 0, length = invokers->GetSize(); i < length; i++) {
         auto invoker = (*invokers)[i];
         delete invoker;

runtime/src/CSharpScriptRuntime.cpp

@@ -11,10 +11,12 @@ alt::IResource::Impl* CSharpScriptRuntime::CreateImpl(alt::IResource* resource)
 }
 
 void CSharpScriptRuntime::DestroyImpl(alt::IResource::Impl* impl) {
-    this->coreClr->Shutdown(this->core, ((CSharpResourceImpl*) impl)->runtimeHost,
-                            ((CSharpResourceImpl*) impl)->domainId);
     delete impl;
 }
 
 void CSharpScriptRuntime::OnTick() {
 }
+
+CSharpScriptRuntime::~CSharpScriptRuntime() {
+    delete this->coreClr;
+}

runtime/src/CoreClr.cpp

@@ -95,8 +95,12 @@ CoreClr::CoreClr(alt::ICore* server) {
 }
 
 CoreClr::~CoreClr() {
+    //TODO: close thread
     delete[] runtimeDirectory;
     delete[] dotnetDirectory;
+    if (cxt != nullptr) {
+        _closeFxr(cxt);
+    }
 }
 
 /*bool CoreClr::GetDelegate(alt::ICore* server, void* runtimeHost, unsigned int domainId, const char* moduleName,
@@ -303,7 +307,7 @@ int CoreClr::Execute(alt::ICore* server, alt::IResource* resource, const char* a
     return result;
 }
 
-void CoreClr::Shutdown(alt::ICore* server, void* runtimeHost,
+/*void CoreClr::Shutdown(alt::ICore* server, void* runtimeHost,
                        unsigned int domainId) {
     if (cxt != nullptr) {
         _closeFxr(cxt);
@@ -316,7 +320,7 @@ void CoreClr::Shutdown(alt::ICore* server, void* runtimeHost,
     } else {
         server->LogInfo(alt::String("coreclr-module: Host successfully shotted down"));
     }
-}
+}*/
 
 void CoreClr::GetPath(alt::ICore* server, const char* defaultPath) {
     auto directory = opendir(defaultPath);