xrManagedApi: fix windows build

OpenXRay · Aug 19, 2018 · 1281255 · 1281255
1 parent 277dab3
commit 1281255
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/editors/xrManagedApi/core/Core.cpp b/src/editors/xrManagedApi/core/Core.cpp
@@ -24,10 +24,11 @@ void Core::Initialize(String ^ appName, LogCallback ^ logCallback, bool initFs,
     if (fsFileName)
     {
         std::string fsFileNameC = msclr::interop::marshal_as<std::string>(fsFileName);
-        ::Core.Initialize(appNameC.c_str(), ::LogCallback(LogCallbackWrapper, nullptr), initFs, fsFileNameC.c_str());
+        ::Core.Initialize(
+            appNameC.c_str(), nullptr ,::LogCallback(LogCallbackWrapper, nullptr), initFs, fsFileNameC.c_str());
     }
     else
-        ::Core.Initialize(appNameC.c_str(), ::LogCallback(LogCallbackWrapper, nullptr), initFs, nullptr);
+        ::Core.Initialize(appNameC.c_str(), nullptr, ::LogCallback(LogCallbackWrapper, nullptr), initFs, nullptr);
 }
 
 void Core::Initialize(String ^ appName, LogCallback ^ logCallback, bool initFs)

diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -193,8 +193,10 @@ void xrCore::Initialize(pcstr _ApplicationName, pcstr commandLine, LogCallback c
         PluginMode = plugin;
         // Init COM so we can use CoCreateInstance
         // HRESULT co_res =
-
-        Params = xr_strdup (commandLine);
+        if (commandLine)
+            Params = xr_strdup (commandLine);
+        else
+            Params = xr_strdup("");
 
 #if defined(WINDOWS)
         if (!strstr(Params, "-weather"))