diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-05-11 11:04:01 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-05-11 11:06:56 +1200 |
| commit | 692cfbaa90975efd660beff38675e6a7041e2e23 (patch) | |
| tree | 109a7bd18dc63909489c3e92af373eb1b44791f8 | |
| parent | 6707baf16f6dd9e85508544c751576d8d194507d (diff) | |
Merge pull request #4664 from Montellese/broken_checks13.1b1-Gotham
fix broken comparisons
Conflicts:
xbmc/settings/windows/GUIControlSettings.cpp
| -rw-r--r-- | xbmc/Autorun.cpp | 2 | ||||
| -rw-r--r-- | xbmc/interfaces/legacy/Dialog.cpp | 4 | ||||
| -rw-r--r-- | xbmc/settings/windows/GUIControlSettings.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp index 27519508ce..3040c4dc0e 100644 --- a/xbmc/Autorun.cpp +++ b/xbmc/Autorun.cpp @@ -83,7 +83,7 @@ void CAutorun::ExecuteAutorun(const CStdString& path, bool bypassSettings, bool bool CAutorun::PlayDisc(const CStdString& path, bool bypassSettings, bool startFromBeginning) { - if ( !bypassSettings && !CSettings::Get().GetInt("audiocds.autoaction") == AUTOCD_PLAY && !CSettings::Get().GetBool("dvds.autorun")) + if ( !bypassSettings && CSettings::Get().GetInt("audiocds.autoaction") != AUTOCD_PLAY && !CSettings::Get().GetBool("dvds.autorun")) return false; int nSize = g_playlistPlayer.GetPlaylist( PLAYLIST_MUSIC ).size(); diff --git a/xbmc/interfaces/legacy/Dialog.cpp b/xbmc/interfaces/legacy/Dialog.cpp index 972fde5aa8..2856b210e7 100644 --- a/xbmc/interfaces/legacy/Dialog.cpp +++ b/xbmc/interfaces/legacy/Dialog.cpp @@ -160,7 +160,7 @@ namespace XBMCAddon if (!shares) throw WindowException("Error: GetSources given %s is NULL.",s_shares.c_str()); - if (useFileDirectories && (!maskparam.empty() && !maskparam.size() == 0)) + if (useFileDirectories && !maskparam.empty()) mask += "|.rar|.zip"; value = defaultt; @@ -184,7 +184,7 @@ namespace XBMCAddon if (!shares) throw WindowException("Error: GetSources given %s is NULL.",s_shares.c_str()); - if (useFileDirectories && (!lmask.empty() && !(lmask.size() == 0))) + if (useFileDirectories && !lmask.empty()) lmask += "|.rar|.zip"; if (type == 1) diff --git a/xbmc/settings/windows/GUIControlSettings.cpp b/xbmc/settings/windows/GUIControlSettings.cpp index 0fce4b8037..8d20c4a521 100644 --- a/xbmc/settings/windows/GUIControlSettings.cpp +++ b/xbmc/settings/windows/GUIControlSettings.cpp @@ -502,7 +502,7 @@ bool CGUIControlButtonSetting::OnClick() // prompt for the addon CSettingAddon *setting = (CSettingAddon *)m_pSetting; CStdString addonID = setting->GetValue(); - if (!CGUIWindowAddonBrowser::SelectAddonID(setting->GetAddonType(), addonID, setting->AllowEmpty()) == 1) + if (CGUIWindowAddonBrowser::SelectAddonID(setting->GetAddonType(), addonID, setting->AllowEmpty()) != 1) return false; return setting->SetValue(addonID); |