From 7194ac346df0ba131b658d0ba4c950cf25f3db6e Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 3 Nov 2012 16:25:17 +0100 Subject: [PATCH] neutrino: fix segfault during startup when updating config --- src/neutrino.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 45285b157..73b6e7740 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2311,7 +2311,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) res = res | g_RemoteControl->handleMsg(msg, data); res = res | g_InfoViewer->handleMsg(msg, data); - res = res | channelList->handleMsg(msg, data); + if (channelList) /* can be not yet ready during startup */ + res = res | channelList->handleMsg(msg, data); + // else fprintf(stderr, "channelList = NULL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); res = res | CRecordManager::getInstance()->handleMsg(msg, data); if( res != messages_return::unhandled ) {