diff options
| author | clsid <clsid2@users.sourceforge.net> | 2012-12-12 00:38:06 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-12-14 20:57:21 +0400 |
| commit | aa57480ac0f326c6acdc00aebf2cd13eef06447e (patch) | |
| tree | b24297d34a705c768a5b8a429e3a5f9e27892608 | |
| parent | 92e0f8cb1a1a91d6324c382e130dd055211d3ccb (diff) | |
Only set string value on successful read from Registry
| -rw-r--r-- | demuxer/LAVSplitter/LAVSplitter.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/demuxer/LAVSplitter/LAVSplitter.cpp b/demuxer/LAVSplitter/LAVSplitter.cpp index c8e542bd..76d66991 100644 --- a/demuxer/LAVSplitter/LAVSplitter.cpp +++ b/demuxer/LAVSplitter/LAVSplitter.cpp @@ -160,16 +160,21 @@ STDMETHODIMP CLAVSplitter::LoadSettings() HRESULT hr; DWORD dwVal; BOOL bFlag; + std::wstring strVal; CRegistry reg = CRegistry(HKEY_CURRENT_USER, LAVF_REGISTRY_KEY, hr); // We don't check if opening succeeded, because the read functions will set their hr accordingly anyway, // and we need to fill the settings with defaults. - // ReadString returns an empty string in case of failure, so thats fine! // Language preferences - m_settings.prefAudioLangs = reg.ReadString(L"prefAudioLangs", hr); - m_settings.prefSubLangs = reg.ReadString(L"prefSubLangs", hr); - m_settings.subtitleAdvanced = reg.ReadString(L"subtitleAdvanced", hr); + strVal = reg.ReadString(L"prefAudioLangs", hr); + if (SUCCEEDED(hr)) m_settings.prefAudioLangs = strVal; + + strVal = reg.ReadString(L"prefSubLangs", hr); + if (SUCCEEDED(hr)) m_settings.prefSubLangs = strVal; + + strVal = reg.ReadString(L"subtitleAdvanced", hr); + if (SUCCEEDED(hr)) m_settings.subtitleAdvanced = strVal; // Subtitle mode, defaults to all subtitles dwVal = reg.ReadDWORD(L"subtitleMode", hr); |