#527 supplemental fix for null point values

ObjectVision · Oct 6, 2023 · 566f335 · 566f335
1 parent cf8ecda
commit 566f335
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/clc/dll/include/ConstOper.h b/clc/dll/include/ConstOper.h
@@ -205,22 +205,16 @@ struct AbstrConstParamOperator : public Operator
 template <typename TR, typename TV=TR>
 class ConstParamOperator : public AbstrConstParamOperator
 {
-	typedef DataArray<TR>          ResultType;
-
 public:
 	ConstParamOperator(AbstrOperGroup* gr, TV value)
-		:	AbstrConstParamOperator(gr
-			,	ResultType::GetStaticClass()
-			,	Unit<typename scalar_of<TR>::type>::GetStaticClass()
-			,	composition_of<TR>::value
-			) 
+		:	AbstrConstParamOperator(gr, DataArray<TR>::GetStaticClass(), Unit<field_of_t<TR>>::GetStaticClass(), composition_of_v<TR>) 
 		,	m_Value(value)
 	{}
 
 	// Override Operator
 	void Calculate(DataWriteLock& res) const override
 	{
-		ResultType* result = mutable_array_cast<TR>(res);
+		auto result = mutable_array_cast<TR>(res);
 		Assign( result->GetWritableTile(0)[0], m_Value);
 	}
 

diff --git a/qtgui/exe/src/main_qt.cpp b/qtgui/exe/src/main_qt.cpp
@@ -392,6 +392,7 @@ int main_without_SE_handler(int argc, char *argv[])
             testResult = std::async([tsn, hwDispatch] { return RunTestScript(tsn, hwDispatch);  });
         }
         splash->finish(&main_window);
+        splash.reset();
 
         main_window.showMaximized();
         auto result = dms_app.exec();