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

[Marcus Tomlinson]

Use refreshScopeMetadata() rather than populateScopes() when invalidating results (populateScopes() is intended for use only on start-up)

[lp:~marcustomlinson/unity-scopes-shell/fix_scope_install_crash]

154. By Marcus Tomlinson on 2014-10-02

Added warning comment about populateScopes()

155. By Marcus Tomlinson on 2014-10-02

Merged trunk and resolved conflict

[Paweł Stołowski (stolowski)]

Looks good and fixes the crash, thanks!

review: Approve

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2014-10-02 07:18:12 +0000
+++ src/Unity/scopes.cpp	2014-10-02 15:47:39 +0000
@@ -235,6 +235,8 @@
     QTimer::singleShot(LIST_DELAY, this, SLOT(populateScopes()));
 }
 
+// *N.B.* populateScopes() is intended for use only on start-up!
+// In any other circumstance, use refreshScopeMetadata() to invalidate results.
 void Scopes::populateScopes()
 {
     auto thread = new ScopeListWorker;
@@ -439,6 +441,8 @@
         m_cachedMetadata[QString::fromStdString(it->first)] = std::make_shared<unity::scopes::ScopeMetadata>(it->second);
     }
 
+    processFavoriteScopes();
+
     Q_EMIT metadataRefreshed();
 
     m_listThread = nullptr;
@@ -457,7 +461,7 @@
             scope->invalidateResults();
         }
     } else if (scopeName == "scopes") {
-        populateScopes();
+        refreshScopeMetadata();
         return;
     }