restore setting m_appName broken by recent change (fixes bug 1921954)

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 7a6978b2556946dcf75624e3ba8ec4fec35c0905..1efd57adddb6bd1cc567ed083c5a71241bc97e74 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -167,7 +167,7 @@ wxAppConsoleBase::~wxAppConsoleBase()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 

-bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
+bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)

 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();
 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();


@@ -178,7 +178,7 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
 #endif
 
 #ifndef __WXPALMOS__
 #endif
 
 #ifndef __WXPALMOS__

-    if ( m_appName.empty() && argv )
+    if ( m_appName.empty() && argv && argv[0] )

     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);