Skip to content

Commit 90d7dc0

Browse files
committed
fix segfault in "vdr -V" or "vdr --help"
1 parent 738056e commit 90d7dc0

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

softhddevice-drm-gles.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ cPluginSoftHdDevice::cPluginSoftHdDevice(void)
8484
m_pConfig = new cSoftHdConfig();
8585
m_pDevice = new cSoftHdDevice(m_pConfig); // no need to delete m_pDevice, because VDR does it for us
8686
m_pAudio = m_pDevice->Audio();
87-
m_pDevice->Init();
8887
}
8988

9089
/**
@@ -94,7 +93,6 @@ cPluginSoftHdDevice::cPluginSoftHdDevice(void)
9493
*/
9594
cPluginSoftHdDevice::~cPluginSoftHdDevice(void)
9695
{
97-
LOGDEBUG("plugin: %s:", __FUNCTION__);
9896
delete m_pConfig;
9997
}
10098

@@ -133,7 +131,7 @@ const char *cPluginSoftHdDevice::CommandLineHelp(void)
133131
*/
134132
bool cPluginSoftHdDevice::ProcessArgs(int argc, char *argv[])
135133
{
136-
LOGDEBUG("plugin: %s:", __FUNCTION__);
134+
// LOGDEBUG("plugin: %s:", __FUNCTION__);
137135

138136
return m_pDevice->ProcessArgs(argc, argv);
139137
}
@@ -147,9 +145,10 @@ bool cPluginSoftHdDevice::ProcessArgs(int argc, char *argv[])
147145
*/
148146
bool cPluginSoftHdDevice::Initialize(void)
149147
{
150-
LOGDEBUG("plugin: %s:", __FUNCTION__);
148+
// LOGDEBUG("plugin: %s:", __FUNCTION__);
149+
150+
m_pDevice->Init();
151151

152-
// nothing to do
153152
return true;
154153
}
155154

@@ -158,7 +157,7 @@ bool cPluginSoftHdDevice::Initialize(void)
158157
*/
159158
bool cPluginSoftHdDevice::Start(void)
160159
{
161-
LOGDEBUG("%s:", __FUNCTION__);
160+
// LOGDEBUG("plugin: %s:", __FUNCTION__);
162161

163162
if (!m_pDevice->IsPrimaryDevice()) {
164163
LOGINFO("softhddevice %d is not the primary device!",

softhddevice.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ cSoftHdDevice::~cSoftHdDevice(void)
540540
*/
541541
void cSoftHdDevice::Init()
542542
{
543+
LOGDEBUG("device: %s:", __FUNCTION__);
543544
m_pRender->Prepare();
544545
}
545546

0 commit comments

Comments
 (0)