From 69c5b7f110a7e452fff56498bea241c3498879d9 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 11 Mar 2020 20:27:50 +0000 Subject: trackchange: using 'sh -c' for all commands git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9282 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/trackchange/trackchange.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/plugins/General/trackchange/trackchange.cpp b/src/plugins/General/trackchange/trackchange.cpp index 601a646f8..55039cc0c 100644 --- a/src/plugins/General/trackchange/trackchange.cpp +++ b/src/plugins/General/trackchange/trackchange.cpp @@ -43,8 +43,8 @@ TrackChange::TrackChange(QObject *parent) : QObject(parent) m_endOfTrackCommand = settings.value("end_of_track_command").toString(); m_endOfPlCommand = settings.value("end_of_pl_command").toString(); m_titleChangeCommand = settings.value("title_change_command").toString(); - m_appStartupCommand = settings.value("title_change_command").toString(); - m_appExitCommand = settings.value("title_change_command").toString(); + m_appStartupCommand = settings.value("application_startup_command").toString(); + m_appExitCommand = settings.value("application_exit_command").toString(); settings.endGroup(); connect(qApp, SIGNAL(aboutToQuit()), SLOT(onAppExit())); @@ -108,11 +108,11 @@ void TrackChange::onAppStartup() { if(QApplication::allWindows().count() == 1 && !m_appStartupCommand.isEmpty()) //detect startup { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) - QStringList tokens = QProcess::splitCommand(m_appStartupCommand); - QProcess::startDetached(tokens.first(), tokens.mid(1)); +#ifdef Q_OS_WIN + QProcess::startDetached(QString("cmd.exe /C %1").arg(m_appStartupCommand)); #else - QProcess::startDetached(m_appStartupCommand); + QStringList args = { "-c", m_appStartupCommand }; + QProcess::startDetached("sh", args); #endif } } @@ -121,11 +121,11 @@ void TrackChange::onAppExit() { if(!m_appExitCommand.isEmpty()) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) - QStringList tokens = QProcess::splitCommand(m_appExitCommand); - QProcess::startDetached(tokens.first(), tokens.mid(1)); +#ifdef Q_OS_WIN + QProcess::startDetached(QString("cmd.exe /C %1").arg(m_appExitCommand)); #else - QProcess::startDetached(m_appExitCommand); + QStringList args = { "-c", m_appExitCommand }; + QProcess::startDetached("sh", args); #endif } } -- cgit v1.2.3-13-gbd6f