mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
kinit: start services in the service path if not empty
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
307e136a13
commit
ae4c786744
1 changed files with 5 additions and 1 deletions
|
@ -346,10 +346,14 @@ int KLauncherAdaptor::start_service_by_desktop_path(const QString &serviceName,
|
||||||
kWarning() << "could not process service" << kservice->entryPath();
|
kWarning() << "could not process service" << kservice->entryPath();
|
||||||
return KLauncherAdaptor::ArgumentsError;
|
return KLauncherAdaptor::ArgumentsError;
|
||||||
}
|
}
|
||||||
|
QString programworkdir = kservice->path();
|
||||||
|
if (programworkdir.isEmpty()) {
|
||||||
|
programworkdir = QDir::currentPath();
|
||||||
|
}
|
||||||
kDebug() << "starting" << kservice->entryPath() << urls;
|
kDebug() << "starting" << kservice->entryPath() << urls;
|
||||||
const QString program = programandargs.takeFirst();
|
const QString program = programandargs.takeFirst();
|
||||||
qint64 pid = 0;
|
qint64 pid = 0;
|
||||||
return startProgram(program, programandargs, envs, QString(), QDir::currentPath(), pid, m_startuptimeout, kservice);
|
return startProgram(program, programandargs, envs, QString(), programworkdir, pid, m_startuptimeout, kservice);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef KLAUNCHER_DEBUG
|
#ifdef KLAUNCHER_DEBUG
|
||||||
|
|
Loading…
Add table
Reference in a new issue