From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 21 Mar 2008 16:21:51 +0000 (+0000)
Subject: restore setting m_appName broken by recent change (fixes bug 1921954)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a7d980f639a5051b62bacc17ef5bfb84986a7f58?ds=inline

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 7a6978b255..1efd57addd 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -167,7 +167,7 @@ wxAppConsoleBase::~wxAppConsoleBase()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
-bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
+bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)
 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();
@@ -178,7 +178,7 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
 #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);