Merge pull request #14547 from lrusak/settingscomponent-fix

libinput: check CSettingsComponent for nullptr
garbear · Oct 9, 2018 · d1c102c · d1c102c
2 parents 02dbf43 + 54796ec
commit d1c102c
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/xbmc/platform/linux/input/LibInputSettings.cpp b/xbmc/platform/linux/input/LibInputSettings.cpp
@@ -99,12 +99,16 @@ CLibInputSettings::CLibInputSettings(CLibInputHandler *handler) :
 
 CLibInputSettings::~CLibInputSettings()
 {
-  const std::shared_ptr<CSettings> settings = CServiceBroker::GetSettingsComponent()->GetSettings();
-  if (settings)
-  {
-    settings->GetSettingsManager()->UnregisterSettingOptionsFiller("libinputkeyboardlayout");
-    settings->GetSettingsManager()->UnregisterCallback(this);
-  }
+  CSettingsComponent *settingsComponent = CServiceBroker::GetSettingsComponent();
+  if (!settingsComponent)
+    return;
+
+  const std::shared_ptr<CSettings> settings = settingsComponent->GetSettings();
+  if (!settings)
+    return;
+
+  settings->GetSettingsManager()->UnregisterSettingOptionsFiller("libinputkeyboardlayout");
+  settings->GetSettingsManager()->UnregisterCallback(this);
 }
 
 void CLibInputSettings::SettingOptionsKeyboardLayoutsFiller(std::shared_ptr<const CSetting> setting, std::vector< std::pair<std::string, std::string> > &list, std::string &current, void *data)