Skip to content
Browse files

MythNetvision: Fix segmentation fault in NetTree::showMenu

Fixes #10603

Also removed some unused code.
(cherry picked from commit ba9bcba)

Conflicts:

	mythplugins/mythnetvision/mythnetvision/nettree.cpp
	mythplugins/mythnetvision/mythnetvision/rsseditor.cpp
  • Loading branch information...
1 parent 4b7e39e commit 4637842926a3897445fa1dc6003260125a83a305 @natanojl natanojl committed Apr 15, 2012
View
7 mythplugins/mythnetvision/mythnetvision/nettree.cpp
@@ -495,7 +495,12 @@ void NetTree::showMenu(void)
ResultItem *item = NULL;
if (m_type == DLG_TREE)
- item = qVariantValue<ResultItem *>(m_siteMap->GetCurrentNode()->GetData());
+ {
+ MythGenericTree *node = m_siteMap->GetCurrentNode();
+
+ if (node)
+ item = qVariantValue<ResultItem *>(node->GetData());
+ }
else
{
MythGenericTree *node = GetNodePtrFromButton(m_siteButtonList->GetItemCurrent());
View
6 mythplugins/mythnetvision/mythnetvision/rsseditor.cpp
@@ -222,12 +222,6 @@ void RSSEditPopup::slotSave(QNetworkReply* reply)
QString author = m_authorEdit->GetText();
QString file = m_thumbImage->GetFilename();
- bool download;
- if (m_download->GetCheckState() == MythUIStateType::Full)
- download = true;
- else
- download = false;
-
VERBOSE(VB_GENERAL|VB_EXTRA, QString("Text to Parse: %1").arg(text));
QDomElement root = document.documentElement();

0 comments on commit 4637842

Please sign in to comment.
Something went wrong with that request. Please try again.