yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't load incompatible deco plugins in kcm

Browse source 
... and prevent accessing them in addition
shall fix crash Martin documented in
http://git.reviewboard.kde.org/r/105021/

REVIEW: 105379
This commit is contained in:
Thomas Lübking 2012-06-28 18:16:50 +02:00
parent 4660c2086a
commit bcbd7181f1
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
kcmkwin/kwindecoration/decorationmodel.cpp
View file

@ -94,6 +94,10 @@ void DecorationModel::findDecorations()
findAuroraeThemes();
continue;
}
if (m_plugins->loadPlugin(libName))
m_plugins->destroyPreviousPlugin();
else
continue;
DecorationModelData data;
data.name = desktopFile.readName();
data.libraryName = libName;
@ -307,16 +311,22 @@ void DecorationModel::regeneratePreview(const QModelIndex& index, const QSize& s
html = QString("<div style=\"color: %1\" align=\"center\">%2</div>").arg(color.name()).arg(html);
document.setHtml(html);
if (m_plugins->loadPlugin(data.libraryName) &&
m_preview->recreateDecoration(m_plugins))
bool enabled = false;
if (m_plugins->loadPlugin(data.libraryName) && m_preview->recreateDecoration(m_plugins)) {
enabled = true;
m_preview->enablePreview();
else
} else {
m_preview->disablePreview();
}
m_plugins->destroyPreviousPlugin();
m_preview->resize(size);
m_preview->setTempButtons(m_plugins, m_customButtons, m_leftButtons, m_rightButtons);
m_preview->setTempBorderSize(m_plugins, data.borderSize);
data.preview = m_preview->preview(&document, m_renderWidget);
if (enabled) {
m_preview->resize(size);
m_preview->setTempButtons(m_plugins, m_customButtons, m_leftButtons, m_rightButtons);
m_preview->setTempBorderSize(m_plugins, data.borderSize);
data.preview = m_preview->preview(&document, m_renderWidget);
} else {
m_decorations.removeAt(index.row());
}
break;
}
default: