From 48a4f956ad7ae11770bafc1b03aaa3fffc5f04ad Mon Sep 17 00:00:00 2001 From: Mashiro Date: Mon, 9 Mar 2020 15:34:57 +0300 Subject: Fix CDTEXT processing K3bDevice::CdText::textForPackType returns link to a destructed object Additionally, same issue was fixed for AudioEncoder module Signed-off-by: Mashiro (cherry picked from commit 9b2384124659597c7385ec500f4da0bdcd2d3ef7) --- libk3b/plugin/k3baudioencoder.cpp | 2 +- libk3bdevice/k3bcdtext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libk3b/plugin/k3baudioencoder.cpp b/libk3b/plugin/k3baudioencoder.cpp index 76240e4..f996d6e 100644 --- a/libk3b/plugin/k3baudioencoder.cpp +++ b/libk3b/plugin/k3baudioencoder.cpp @@ -91,7 +91,7 @@ const TQString& K3bAudioEncoder::filename() const if( d->outputFile ) return d->outputFilename; else - return TQString(); + return TQString::null; } diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp index 3bb6fa8..e195eb1 100644 --- a/libk3bdevice/k3bcdtext.cpp +++ b/libk3bdevice/k3bcdtext.cpp @@ -524,7 +524,7 @@ const TQString& K3bDevice::CdText::textForPackType( int packType, unsigned int t if( track == 0 ) return discId(); else - return TQString(); + return TQString::null; // case 0x87: // if( track == 0 ) -- cgit v1.2.1