Don't convert args if NULL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 35a9e2a58e02af2d1842877122d068d596d3a5b9..fd8d8e723a94a032c003c09bb55c4949545865c6 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -779,7 +779,8 @@ int wxEntry(WXHINSTANCE hInstance,
         wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
         // save the WinMain() parameters
         wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
         // save the WinMain() parameters

-        wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
+        if (lpCmdLine) // MicroWindows pass NULL for this
+            wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);

         wxTheApp->m_nCmdShow = nCmdShow;
 
         // We really don't want timestamps by default, because it means
         wxTheApp->m_nCmdShow = nCmdShow;
 
         // We really don't want timestamps by default, because it means