diff options
| author | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2013-10-31 15:09:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-01 08:44:40 +0100 |
| commit | 4f563f6beec488ee03a1b4bc53df350c50103805 (patch) | |
| tree | 54ba279b290f5c646c652a6cec30922ddfd09985 | |
| parent | a9b6a78e54670a70b96c122b10ad7bd64d166514 (diff) | |
Avoid adding empty arguments
QByteArray split does create one item even if the string is empty.
Hence check if the launch arguments string needs to be parsed at all.
Change-Id: I0a355212aaa7254fe0f417c61a59c30223311915
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/winmain/qtmain_winrt.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp index c0542ff242..8ad5f56bee 100644 --- a/src/winmain/qtmain_winrt.cpp +++ b/src/winmain/qtmain_winrt.cpp @@ -115,11 +115,13 @@ private: m_argv.resize(m_argc); HSTRING arguments; launchArgs->get_Arguments(&arguments); - foreach (const QByteArray &arg, QString::fromWCharArray( - WindowsGetStringRawBuffer(arguments, nullptr)).toLocal8Bit().split(' ')) { - m_argv.append(qstrdup(arg.constData())); - if (arg == "-qdebug") - m_debugWait = true; + if (arguments) { + foreach (const QByteArray &arg, QString::fromWCharArray( + WindowsGetStringRawBuffer(arguments, nullptr)).toLocal8Bit().split(' ')) { + m_argv.append(qstrdup(arg.constData())); + if (arg == "-qdebug") + m_debugWait = true; + } } } return S_OK; |