Fixed TManagedPointer & TKernel null reference

AdventureT · Dec 8, 2023 · d7d2af4 · d7d2af4
1 parent f79cf6b
commit d7d2af4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Toshi/Include/TKernel/TManagedPointer.h b/Toshi/Include/TKernel/TManagedPointer.h
@@ -7,7 +7,7 @@ template<class T>
 class TOSHI_EXPORT TManagedPointer
 {
 public:
-    TManagedPointer() : m_pObject(new T())
+    TManagedPointer() : m_pObject(TNULL)
     {
 
     }

diff --git a/Toshi/Include/TKernel/TScheduler.h b/Toshi/Include/TKernel/TScheduler.h
@@ -14,7 +14,7 @@ class TOSHI_EXPORT TScheduler : public TObject
 	DECLARE_DYNAMIC(TScheduler);
 public:
 
-	TScheduler();
+	TScheduler(TKernelInterface* a_pKernel);
 
 	TTask* CreateTask(TClass const& a_rTaskClass, TTask* a_pTask);
 	void Update();

diff --git a/Toshi/Source/TKernel/TKernelInterface.cpp b/Toshi/Source/TKernel/TKernelInterface.cpp
@@ -44,7 +44,7 @@ TKernelInterface::TKernelInterface(TINT argc, TPCHAR* const argv, TBOOL a_bVerbo
 	pAbsSystem->SetPrefix("");
 	pFileManager->SetSystemPath("local");
 
-	m_pScheduler = new TScheduler();
+	m_pScheduler = new TScheduler(this);
 }
 
 TBOOL TKernelInterface::Update()

diff --git a/Toshi/Source/TKernel/TScheduler.cpp b/Toshi/Source/TKernel/TScheduler.cpp
@@ -9,10 +9,10 @@ TBOOL Profiler_Control_ParentStart = TFALSE;
 TBOOL Profiler_Control_ParentStop = TFALSE;
 TProfiler Profiler_Program;
 
-TScheduler::TScheduler()
+TScheduler::TScheduler(TKernelInterface* a_pKernel)
 {
 	m_pCurrentTask = TNULL;
-	m_pKernel = TNULL;
+	m_pKernel = a_pKernel;
 	m_fCurrentTimeDelta = 0.0f;
 	m_fTotalTime = 0.0f;
 	m_fDebugSlowTime = 1.0f;
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ template<class T> @@
     class TOSHI_EXPORT TManagedPointer
     {
     public:
-        TManagedPointer() : m_pObject(new T())
+        TManagedPointer() : m_pObject(TNULL)
         {
         }
@@ Expand Down @@