diff options
| -rwxr-xr-x | lib/libexif/ExifParse.cpp | 5 | ||||
| -rw-r--r-- | xbmc/dbwrappers/dataset.cpp | 1 | ||||
| -rw-r--r-- | xbmc/settings/VideoSettings.cpp | 3 | ||||
| -rw-r--r-- | xbmc/utils/StreamDetails.cpp | 9 | ||||
| -rw-r--r-- | xbmc/windows/GUIMediaWindow.cpp | 3 |
5 files changed, 12 insertions, 9 deletions
diff --git a/lib/libexif/ExifParse.cpp b/lib/libexif/ExifParse.cpp index 64bb815ced..4b230f7fb3 100755 --- a/lib/libexif/ExifParse.cpp +++ b/lib/libexif/ExifParse.cpp @@ -507,10 +507,7 @@ void CExifParse::ProcessDir(const unsigned char* const DirStart, // Tends to be less accurate as distance increases. { float distance = (float)ConvertAnyFormat(ValuePtr, Format); - if (distance < 0) - m_ExifInfo->Distance = distance; // infinite - else - m_ExifInfo->Distance = distance; + m_ExifInfo->Distance = distance; } break; diff --git a/xbmc/dbwrappers/dataset.cpp b/xbmc/dbwrappers/dataset.cpp index 722f09454c..6525cd6952 100644 --- a/xbmc/dbwrappers/dataset.cpp +++ b/xbmc/dbwrappers/dataset.cpp @@ -50,6 +50,7 @@ Database::Database(): sequence_table("db_sequence") { active = false; // No connection yet + compression = false; } Database::~Database() { diff --git a/xbmc/settings/VideoSettings.cpp b/xbmc/settings/VideoSettings.cpp index e253e8e9a4..246c1caa51 100644 --- a/xbmc/settings/VideoSettings.cpp +++ b/xbmc/settings/VideoSettings.cpp @@ -52,6 +52,9 @@ CVideoSettings::CVideoSettings() m_AudioDelay = 0.0f; m_OutputToAllSpeakers = false; m_ResumeTime = 0; + m_StereoMode = 0; + m_StereoInvert = false; + } bool CVideoSettings::operator!=(const CVideoSettings &right) const diff --git a/xbmc/utils/StreamDetails.cpp b/xbmc/utils/StreamDetails.cpp index f0584bc944..5d345718bd 100644 --- a/xbmc/utils/StreamDetails.cpp +++ b/xbmc/utils/StreamDetails.cpp @@ -294,6 +294,9 @@ int CStreamDetails::GetSubtitleStreamCount(void) const CStreamDetails::CStreamDetails(const CStreamDetails &that) { + m_pBestVideo = nullptr; + m_pBestAudio = nullptr; + m_pBestSubtitle = nullptr; *this = that; } @@ -305,9 +308,9 @@ void CStreamDetails::AddStream(CStreamDetail *item) void CStreamDetails::Reset(void) { - m_pBestVideo = NULL; - m_pBestAudio = NULL; - m_pBestSubtitle = NULL; + m_pBestVideo = nullptr; + m_pBestAudio = nullptr; + m_pBestSubtitle = nullptr; std::vector<CStreamDetail *>::iterator iter; for (iter = m_vecItems.begin(); iter != m_vecItems.end(); ++iter) diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp index 764905c524..3013d17180 100644 --- a/xbmc/windows/GUIMediaWindow.cpp +++ b/xbmc/windows/GUIMediaWindow.cpp @@ -1594,8 +1594,7 @@ bool CGUIMediaWindow::OnContextButton(int itemNumber, CONTEXT_BUTTON button) case CONTEXT_BUTTON_BROWSE_INTO: { CFileItemPtr item = m_vecItems->Get(itemNumber); - if(Update(item->GetPath())) - return true; + Update(item->GetPath()); return true; } case CONTEXT_BUTTON_USER1: |