From a7d980f639a5051b62bacc17ef5bfb84986a7f58 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 21 Mar 2008 16:21:51 +0000 Subject: [PATCH] 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 --- src/common/appbase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);