Make sure m_callback is not null before using it (#541)

This commit is contained in:
Bartosz Sosnowski
2019-10-23 18:42:40 +02:00
committed by GitHub
parent 70f40e207a
commit 8f8f4506ff

View File

@@ -92,7 +92,10 @@ IFACEMETHODIMP_(void) FancyZonesSettings::SetConfig(PCWSTR config) noexcept try
{ {
LoadSettings(config, false /*fromFile*/); LoadSettings(config, false /*fromFile*/);
SaveSettings(); SaveSettings();
m_callback->SettingsChanged(); if (m_callback)
{
m_callback->SettingsChanged();
}
Trace::SettingsChanged(m_settings); Trace::SettingsChanged(m_settings);
} }
CATCH_LOG(); CATCH_LOG();
@@ -103,7 +106,7 @@ IFACEMETHODIMP_(void) FancyZonesSettings::CallCustomAction(PCWSTR action) noexce
PowerToysSettings::CustomActionObject action_object = PowerToysSettings::CustomActionObject action_object =
PowerToysSettings::CustomActionObject::from_json_string(action); PowerToysSettings::CustomActionObject::from_json_string(action);
if (action_object.get_name() == L"ToggledFZEditor") if (m_callback && action_object.get_name() == L"ToggledFZEditor")
{ {
m_callback->ToggleEditor(); m_callback->ToggleEditor();
} }