Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kinit: keep reference to the QByteArray object in KLauncher::cancel_service_startup_info()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-05-25 12:11:08 +03:00
parent 24a903d65f
commit bf28b99836
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kinit/klauncher.cpp
View file

@ -882,17 +882,17 @@ KLauncher::cancel_service_startup_info( KLaunchRequest* request, const QByteArra
request->startup_id = "0"; // krazy:exclude=doublequote_chars
if( !startup_id.isEmpty() && startup_id != "0" )
{
QString dpy_str;
QByteArray dpy_bytes;
foreach (const QString &env, envs) {
if (env.startsWith(QLatin1String("DISPLAY=")))
dpy_str = env.mid(8);
dpy_bytes = env.mid(8).toLatin1();
}
Display* dpy = NULL;
if( !dpy_str.isEmpty() && mCached_dpy != NULL
&& dpy_str != QString::fromLatin1(XDisplayString( mCached_dpy )) )
if( !dpy_bytes.isEmpty() && mCached_dpy != NULL
&& dpy_bytes != XDisplayString( mCached_dpy ) )
dpy = mCached_dpy;
if( dpy == NULL )
dpy = XOpenDisplay( dpy_str.toLatin1().constData() );
dpy = XOpenDisplay( dpy_bytes.constData() );
if( dpy == NULL )
return;
KStartupInfoId id;