Merge lp:~marcustomlinson/unity-scopes-shell/settings_crash_fix into lp:unity-scopes-shell

[Marcus Tomlinson]

Check validity of m_settingsModel and m_scopesInstance pointers before dereferencing them in Scope::settings()

[Michi Henning (michihenning)]

Looks good!

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2015-02-03 11:15:21 +0000
+++ src/Unity/scope.cpp	2015-02-04 04:53:06 +0000
@@ -851,7 +851,10 @@
 
 unity::shell::scopes::SettingsModelInterface* Scope::settings() const
 {
-    m_settingsModel->update_child_scopes(m_scopesInstance->getAllMetadata());
+    if (m_settingsModel && m_scopesInstance)
+    {
+        m_settingsModel->update_child_scopes(m_scopesInstance->getAllMetadata());
+    }
     return m_settingsModel.data();
 }