@@ -67,10 +67,11 @@ Categories::getResults(int index) const
67 results->setModel(unity_results->model());
67 results->setModel(unity_results->model());
69 // No results model returned by unity core; this can be the case when the global
69 // No results model returned by unity core; this can be the case when the global
70− // results model of this scope became invalid in unity core. Don't set backend
70+ // results model of this scope is still not set in unity core. Don't set backend
71 // model in DeeListModel - it will still beahve properly as an empty model. Since
71 // model in DeeListModel - it will still beahve properly as an empty model. Since
72− // we're connected to the results model change signal, we'll reset category models
72+ // we're connected to the category model change signal, and it is set by unity core
73− // when results model is set again.
73+ // at the same time as results model (on channel opening), we'll reset category
74+ // results models with proper models when we're notifed again.
74 qWarning() << "No results model for category" << categoryIndex;
75 qWarning() << "No results model for category" << categoryIndex;
@@ -109,9 +110,6 @@ Categories::setUnityScope(const unity::dash::Scope::Ptr& scope)
109 m_categoriesChangedConnection.disconnect();
110 m_categoriesChangedConnection.disconnect();
110 m_categoriesChangedConnection =
111 m_categoriesChangedConnection =
111 m_unityScope->categories()->model.changed.connect(sigc::mem_fun(this, &Categories::onCategoriesModelChanged));
112 m_unityScope->categories()->model.changed.connect(sigc::mem_fun(this, &Categories::onCategoriesModelChanged));
113− m_resultsChangedConnection.disconnect();
114− m_resultsChangedConnection = m_unityScope->results()->model.changed.connect(sigc::mem_fun(this, &Categories::onScopeResultsModelChanged));