Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
388768b3
Commit
388768b3
authored
Apr 26, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
db/proxy: call mpd_search_cancel() after search error
Fixes "search already in progress" errors.
parent
5c4169e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
NEWS
NEWS
+2
-0
ProxyDatabasePlugin.cxx
src/db/plugins/ProxyDatabasePlugin.cxx
+12
-2
No files found.
NEWS
View file @
388768b3
ver 0.20.19 (not yet released)
* protocol
- validate absolute seek time, reject negative values
* database
- proxy: fix "search already in progress" errors
* input
- mms: fix lockup bug and a crash bug
* decoder
...
...
src/db/plugins/ProxyDatabasePlugin.cxx
View file @
388768b3
...
...
@@ -682,7 +682,7 @@ static void
SearchSongs
(
struct
mpd_connection
*
connection
,
const
DatabaseSelection
&
selection
,
VisitSong
visit_song
)
{
try
{
assert
(
selection
.
recursive
);
assert
(
visit_song
);
...
...
@@ -709,6 +709,11 @@ SearchSongs(struct mpd_connection *connection,
if
(
!
mpd_response_finish
(
connection
))
ThrowError
(
connection
);
}
catch
(...)
{
if
(
connection
!=
nullptr
)
mpd_search_cancel
(
connection
);
throw
;
}
/**
...
...
@@ -758,7 +763,7 @@ ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection,
TagType
tag_type
,
gcc_unused
tag_mask_t
group_mask
,
VisitTag
visit_tag
)
const
{
try
{
// TODO: eliminate the const_cast
const_cast
<
ProxyDatabase
*>
(
this
)
->
EnsureConnected
();
...
...
@@ -801,6 +806,11 @@ ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection,
if
(
!
mpd_response_finish
(
connection
))
ThrowError
(
connection
);
}
catch
(...)
{
if
(
connection
!=
nullptr
)
mpd_search_cancel
(
connection
);
throw
;
}
DatabaseStats
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment