mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-05 12:54:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a race condition in CategoryListView.

Browse Source
This commit is contained in:
casey 2016-06-12 17:43:13 -07:00
parent be5ef75fad
commit 33cd7c8340
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/musikbox/app/layout/BrowseLayout.cpp
View File

@ -61,7 +61,6 @@ BrowseLayout::BrowseLayout(
}
BrowseLayout::~BrowseLayout() {
}
void BrowseLayout::Layout() {

18
src/musikbox/app/window/CategoryListView.cpp
View File

@ -73,6 +73,8 @@ void CategoryListView::RequeryWithField(
const std::string& filter,
const DBID selectAfterQuery)
{
boost::mutex::scoped_lock lock(this->queryMutex);
if (this->activeQuery) {
this->activeQuery->Cancel();
}
@ -117,10 +119,13 @@ void CategoryListView::SetFieldName(const std::string& fieldName) {
}
void CategoryListView::OnQueryCompleted(IQueryPtr query) {
if (query == this->activeQuery) {
boost::mutex::scoped_lock lock(this->queryMutex);
auto active = this->activeQuery;
if (query == active) {
int selectIndex = -1;
if (this->selectAfterQuery != 0) {
selectIndex = this->activeQuery->GetIndexOf(this->selectAfterQuery);
selectIndex = active->GetIndexOf(this->selectAfterQuery);
}
this->PostMessage(WINDOW_MESSAGE_QUERY_COMPLETED, selectIndex);
@ -129,15 +134,18 @@ void CategoryListView::OnQueryCompleted(IQueryPtr query) {
void CategoryListView::ProcessMessage(IMessage &message) {
if (message.Type() == WINDOW_MESSAGE_QUERY_COMPLETED) {
boost::mutex::scoped_lock lock(this->queryMutex);
if (this->activeQuery && this->activeQuery->GetStatus() == IQuery::Finished) {
this->metadata = activeQuery->GetResult();
activeQuery.reset();
/* UserData1 will be the index of the item we should select. if
the value is -1, we won't go out of our way to select anything. */
if (message.UserData1() > 0) {
this->SetSelectedIndex((int) message.UserData1());
this->ScrollTo((int) message.UserData1());
int selectedIndex = static_cast<int>(message.UserData1());
if (selectedIndex >= 0) {
this->SetSelectedIndex(selectedIndex);
this->ScrollTo(selectedIndex);
}
this->OnAdapterChanged();

1
src/musikbox/app/window/CategoryListView.h
View File

@ -102,6 +102,7 @@ namespace musik {
LibraryPtr library;
Adapter *adapter;
DBID selectAfterQuery;
boost::mutex queryMutex;
std::string fieldName;
std::shared_ptr<CategoryListViewQuery> activeQuery;