From 23305b9ca1195f65c3c4f6ebe49e730522dafcaa Mon Sep 17 00:00:00 2001 From: Daniel Kristjansson Date: Mon, 25 Jul 2011 21:44:45 -0400 Subject: [PATCH] Make sure DeviceReadBuffer::videodevice is never QString::null, this will cause the logging to segfault. --- mythtv/libs/libmythtv/DeviceReadBuffer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mythtv/libs/libmythtv/DeviceReadBuffer.cpp b/mythtv/libs/libmythtv/DeviceReadBuffer.cpp index cce57327b62..8c7128be738 100644 --- a/mythtv/libs/libmythtv/DeviceReadBuffer.cpp +++ b/mythtv/libs/libmythtv/DeviceReadBuffer.cpp @@ -18,7 +18,7 @@ using namespace std; #define LOC_ERR QString("DevRdB(%1) Error: ").arg(videodevice) DeviceReadBuffer::DeviceReadBuffer(ReaderPausedCB *cb, bool use_poll) - : videodevice(QString::null), _stream_fd(-1), + : videodevice(""), _stream_fd(-1), readerPausedCB(cb), // Data for managing the device ringbuffer @@ -53,6 +53,7 @@ bool DeviceReadBuffer::Setup(const QString &streamName, int streamfd) delete[] buffer; videodevice = streamName; + videodevice = (videodevice == QString::null) ? "" : videodevice; _stream_fd = streamfd; // BEGIN HACK -- see #6897 @@ -124,6 +125,7 @@ void DeviceReadBuffer::Reset(const QString &streamName, int streamfd) QMutexLocker locker(&lock); videodevice = streamName; + videodevice = (videodevice == QString::null) ? "" : videodevice; _stream_fd = streamfd; used = 0;