Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.6.x'

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-06-13 21:14:41 +02:00
parent fac92e17aa 310d280cef
commit 89d593799c
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
NEWS
View File

@@ -23,12 +23,22 @@ ncmpcpp-0.7 (????-??-??)
* Selecting items no longer depends on space mode and is bound by default to Insert key.
* Support for Alt, Ctrl and Shift modifiers as well as Escape key was added.
* Action that updates the environment can now be used in bindings configuration file.
* Searching in text fields now respects regular expression configuration.
* Monolithic 'press_space' action was split into 'add_item_to_playlist', 'toggle_lyrics_update_on_song_change' and 'toggle_visualization_type'.
* Sorting actions were rebound to Ctrl-S.
* Support for range selection was added (bound to Ctrl-V by default). In addition, sorting, reversing and shuffling items in playlist now works on ranges.
* Support for selecting found items was added (bound to Ctrl-_ by default).
ncmpcpp-0.6.5 (????-??-??)
* Description of mouse wheel usage on volume is now correct.
* Configure script now fails if either readline or pthread specific headers are not present.
* Searching in text fields now respects regular expression configuration.
* When numbering tracks in tag editor all the other track tags are discarded.
* Xiph tag DESCRIPTION is now rewritten as COMMENT when updating tags.
* Possible access of already freed memory when downloading artist info is fixed.
* Name of an item is now displayed correctly if present.
* Assertion failure when resizing terminal window with no active MPD connection is fixed.
ncmpcpp-0.6.4 (2015-05-02)
* Fix title of a pop-up which shows during adding selected items to the current playlist.

4
src/song.cpp
View File

@@ -76,7 +76,9 @@ std::string Song::getName(unsigned idx) const
assert(m_song);
mpd_song *s = m_song.get();
const char *res = mpd_song_get_tag(s, MPD_TAG_NAME, idx);
if (!res && idx > 0)
if (res)
return res;
else if (idx > 0)
return "";
const char *uri = mpd_song_get_uri(s);
const char *name = strrchr(uri, '/');

2
src/status.cpp
View File

@@ -576,7 +576,7 @@ void Status::Changes::elapsedTime(bool update_elapsed)
m_kbps = st.kbps();
}
if (m_player_state == MPD::psStop)
if (m_player_state == MPD::psUnknown || m_player_state == MPD::psStop)
{
if (Statusbar::isUnlocked() && Config.statusbar_visibility)
*wFooter << NC::XY(0, 1) << NC::TermManip::ClearToEOL;