From 4f40f5e37059cad5b4bc6880f47f5dbeb06ec49e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 5 Jan 2000 02:46:45 +0000 Subject: [PATCH] small bug fix for composite options git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/cmdline.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp index f42ca0f098..3831fcf595 100644 --- a/src/common/cmdline.cpp +++ b/src/common/cmdline.cpp @@ -521,7 +521,7 @@ int wxCmdLineParser::Parse() } while ( optInd == wxNOT_FOUND ); - if ( (len > 0) && (len != name.length()) ) + if ( (optInd != wxNOT_FOUND) && (len != name.length()) ) { // our option is only part of this argument, there is // something else in it - it is either the value of this @@ -532,9 +532,10 @@ int wxCmdLineParser::Parse() // pretend that all the rest of the argument is the // next argument, in fact wxString arg2 = arg[0u]; - arg2 += name.Mid(len); + arg2 += name.Mid(len + 1); // compensates extra -- m_data->m_arguments.Insert(arg2, n + 1); + count++; } //else: it's our value, we'll deal with it below } -- 2.47.2