Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

A few more issues found from Code Analysis in VS #1186

Merged
merged 3 commits into from

2 participants

@jabbera

Just a couple of other easy things I found.

Sorry I closed the old pull request. Just getting used to git and I made a huge mess out of that old branch.

@jmarshallnz
Owner

Once you're a bit more used to it, you'll notice you can force push a branch over the top of another one (or rebase it and force push) to save opening more pull req's.

@jmarshallnz
Owner

Looks good - thanks!

@jmarshallnz jmarshallnz merged commit 9701022 into xbmc:master
@jmarshallnz jmarshallnz was assigned
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -130,7 +130,7 @@ bool CAESinkDirectSound::Initialize(AEAudioFormat &format, std::string &device)
LPGUID deviceGUID = NULL;
RPC_CSTR wszUuid = NULL;
- HRESULT hr;
+ HRESULT hr = E_FAIL;
std::list<DSDevice> DSDeviceList;
std::string deviceFriendlyName;
DirectSoundEnumerate(DSEnumCallback, &DSDeviceList);
View
2  xbmc/network/websocket/WebSocketV8.cpp
@@ -185,7 +185,7 @@ const CWebSocketFrame* CWebSocketV8::close(WebSocketCloseReason reason /* = WebS
m_state = WebSocketStateClosed;
CWebSocketFrame* frame = new CWebSocketFrame(WebSocketConnectionClose, data, length);
- delete data;
+ delete[] data;
return frame;
}
View
2  xbmc/rendering/dx/RenderSystemDX.cpp
@@ -620,7 +620,7 @@ bool CRenderSystemDX::BeginRender()
if (!m_bRenderCreated)
return false;
- DWORD oldStatus = m_nDeviceStatus;
+ HRESULT oldStatus = m_nDeviceStatus;
if (m_useD3D9Ex)
{
m_nDeviceStatus = ((IDirect3DDevice9Ex*)m_pD3DDevice)->CheckDeviceState(m_hDeviceWnd);
Something went wrong with that request. Please try again.