From 4f563f6beec488ee03a1b4bc53df350c50103805 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 31 Oct 2013 15:09:39 +0100 Subject: 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 --- src/winmain/qtmain_winrt.cpp | 12 +++++++----- 1 file 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; -- cgit v1.2.3