Kaydet (Commit) 200e0c8d authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix a bunch of more crashes when setting personas

Change-Id: I6c2c398e074a41c3173bff57bc12496b4c2032b4
üst 13d50871
......@@ -666,8 +666,8 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
if (aColor
!= rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFieldColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
......@@ -675,8 +675,8 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
if (pEditEngine != 0)
{
aColor = GetSettings().GetStyleSettings().GetFieldTextColor();
if (aColor != rDCEvt.GetOldSettings()->
GetStyleSettings().GetFieldTextColor())
if (!pOldSettings || aColor !=
pOldSettings-> GetStyleSettings().GetFieldTextColor())
{
Font aFont(pEditEngine->GetFont());
aFont.SetColor(aColor);
......@@ -1166,8 +1166,8 @@ void BreakPointWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
if (aColor
!= rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFieldColor())
{
setBackgroundColor(aColor);
Invalidate();
......@@ -1690,8 +1690,8 @@ void ComplexEditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFaceColor());
if (aColor
!= rDCEvt.GetOldSettings()->GetStyleSettings().GetFaceColor())
const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFaceColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
......
......@@ -135,13 +135,14 @@ void Layout::DataChanged (DataChangedEvent const& rDCEvt)
{
bool bInvalidate = false;
Color aColor = GetSettings().GetStyleSettings().GetWindowColor();
if (aColor != rDCEvt.GetOldSettings()->GetStyleSettings().GetWindowColor())
const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetWindowColor())
{
SetBackground(Wallpaper(aColor));
bInvalidate = true;
}
aColor = GetSettings().GetStyleSettings().GetWindowTextColor();
if (aColor != rDCEvt.GetOldSettings()->GetStyleSettings().GetWindowTextColor())
if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetWindowTextColor())
{
Font aFont(GetFont());
aFont.SetColor(aColor);
......
......@@ -98,7 +98,8 @@ void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
if (aColor != rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFieldColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment