diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-31 22:53:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-31 22:53:59 +0100 |
| commit | b4953b41f65313f4b3077654b2299b53cfc1fed6 (patch) | |
| tree | 81a3f1ccc2002d75e2b0d728c7ce6e69dad89d35 | |
| parent | 291e2fe2e7df95019feba8097b68b31ec64be794 (diff) | |
Fix some more incomplete strings in the properties dialogue (#874).
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/raw_convert.cc | 7 | ||||
| -rw-r--r-- | src/lib/raw_convert.h | 4 |
3 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,7 @@ 2016-05-31 Carl Hetherington <cth@carlh.net> + * Fix some more incomplete strings in the properties dialogue (#874). + * Fix crash on opening properties for audio-only files (#881). * Remove mention of finding subtitles when examining diff --git a/src/lib/raw_convert.cc b/src/lib/raw_convert.cc index 93807ded2..bbfd4375d 100644 --- a/src/lib/raw_convert.cc +++ b/src/lib/raw_convert.cc @@ -35,3 +35,10 @@ raw_convert<string, char const *> (char const * v, int) { return v; } + +template <> +string +raw_convert<string, char*> (char * v, int) +{ + return v; +} diff --git a/src/lib/raw_convert.h b/src/lib/raw_convert.h index 623b1c525..46b7d0dff 100644 --- a/src/lib/raw_convert.h +++ b/src/lib/raw_convert.h @@ -51,6 +51,10 @@ raw_convert<std::string, char const *> (char const * v, int); template <> std::string +raw_convert<std::string, char*> (char* v, int); + +template <> +std::string raw_convert<std::string, std::string> (std::string v, int); #endif |
