From 1e9aa08f54fdd80c4fd0e4151a00107f36faf00b Mon Sep 17 00:00:00 2001 From: rogerman Date: Thu, 1 Nov 2018 00:02:05 -0700 Subject: [PATCH] Cocoa Port: Do some minor code cleanup. --- desmume/src/frontend/cocoa/ClientDisplayView.cpp | 6 +----- desmume/src/frontend/cocoa/cocoa_util.mm | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/desmume/src/frontend/cocoa/ClientDisplayView.cpp b/desmume/src/frontend/cocoa/ClientDisplayView.cpp index 497de7762..c5c2bfcc0 100644 --- a/desmume/src/frontend/cocoa/ClientDisplayView.cpp +++ b/desmume/src/frontend/cocoa/ClientDisplayView.cpp @@ -784,7 +784,7 @@ void ClientDisplayPresenter::SetHUDColorInputPendingOnly(uint32_t color32) uint32_t ClientDisplayPresenter::GetInputColorUsingStates(bool pendingState, bool appliedState) { - uint32_t color = this->_hudColorInputAppliedAndPending; + uint32_t color = LE_TO_LOCAL_32(0x80808080); if (pendingState && appliedState) { @@ -798,10 +798,6 @@ uint32_t ClientDisplayPresenter::GetInputColorUsingStates(bool pendingState, boo { color = this->_hudColorInputPendingOnly; } - else - { - color = LE_TO_LOCAL_32(0x80808080); - } return color; } diff --git a/desmume/src/frontend/cocoa/cocoa_util.mm b/desmume/src/frontend/cocoa/cocoa_util.mm index 549215dcf..47c487fa1 100644 --- a/desmume/src/frontend/cocoa/cocoa_util.mm +++ b/desmume/src/frontend/cocoa/cocoa_util.mm @@ -214,6 +214,7 @@ } } + [numberFormatter release]; return ip4Address_u32; }