Merge remote-tracking branch 'upstream/master'

src/video/null_v.cpp

@@ -21,11 +21,13 @@
 /** Factory for the null video driver. */
 static FVideoDriver_Null iFVideoDriver_Null;
 
-const char *VideoDriver_Null::Start(const StringList &parm)
+std::optional<std::string_view> VideoDriver_Null::Start(const StringList &parm)
 {
 #ifdef _MSC_VER
 	/* Disable the MSVC assertion message box. */
 	_set_error_mode(_OUT_TO_STDERR);
+	_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+	_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
 #endif
 
 	this->UpdateAutoResolution();
@@ -41,7 +43,7 @@ const char *VideoDriver_Null::Start(const StringList &parm)
 	/* Do not render, nor blit */
 	Debug(misc, 1, "Forcing blitter 'null'...");
 	BlitterFactory::SelectBlitter("null");
-	return nullptr;
+	return std::nullopt;
 }
 
 void VideoDriver_Null::Stop() { }