summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMashiro <m.t.0x73@gmail.com>2020-03-09 15:34:57 +0300
committerMashiro <m.t.0x73@gmail.com>2020-03-09 21:20:19 +0300
commit9b2384124659597c7385ec500f4da0bdcd2d3ef7 (patch)
treef0d04230cf32b5b0c72c78472ed7628be4e4eb6d
parentb557321865d43aa125591f965a459067ee93bc89 (diff)
downloadk3b-9b2384124659597c7385ec500f4da0bdcd2d3ef7.tar.gz
k3b-9b2384124659597c7385ec500f4da0bdcd2d3ef7.zip
Fix CDTEXT processing
K3bDevice::CdText::textForPackType returns link to a destructed object Additionally, same issue was fixed for AudioEncoder module Signed-off-by: Mashiro <m.t.0x73@gmail.com>
-rw-r--r--libk3b/plugin/k3baudioencoder.cpp2
-rw-r--r--libk3bdevice/k3bcdtext.cpp2
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 )