From d8e4d5f0358e4098547f0ddea18f13f055b2e810 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 30 Sep 2016 03:16:43 -0400 Subject: [PATCH] GameListCtrl: eliminate redundant elses These aren't necessary considering the above condition returns --- Source/Core/DolphinWX/GameListCtrl.cpp | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 0656209c72..39ed2d4e9d 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -715,8 +715,8 @@ const GameListItem* CGameListCtrl::GetISO(size_t index) const { if (index < m_ISOFiles.size()) return m_ISOFiles[index].get(); - else - return nullptr; + + return nullptr; } static CGameListCtrl* caller; @@ -983,21 +983,17 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event) const GameListItem* CGameListCtrl::GetSelectedISO() const { - if (m_ISOFiles.size() == 0) - { + if (m_ISOFiles.empty()) return nullptr; - } - else if (GetSelectedItemCount() == 0) - { + + if (GetSelectedItemCount() == 0) return nullptr; - } - else - { - long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == wxNOT_FOUND) - return nullptr; - return m_ISOFiles[GetItemData(item)].get(); - } + + long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (item == wxNOT_FOUND) + return nullptr; + + return m_ISOFiles[GetItemData(item)].get(); } std::vector CGameListCtrl::GetAllSelectedISOs() const