Michael Stefaniuc : quartz: Simplify code flow logic (PVS-Studio).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8a42eb55da659ebb7943db699e28c23acec5df36
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8a42eb55da659ebb7943db699e...

Author: Michael Stefaniuc 
Date:   Thu Jan  8 11:10:52 2015 +0100

quartz: Simplify code flow logic (PVS-Studio).

---

dlls/quartz/vmr9.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 53e4942..e950a48 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -476,14 +476,12 @@ static HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample
 static HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin)
 {
     struct quartz_vmr *pVMR9 = (struct quartz_vmr*)This;
-    HRESULT hr = S_OK;
+    HRESULT hr;

TRACE("(%p)\n", This);

-    if (!pVMR9->mode && SUCCEEDED(hr))
-        hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed);
-
-    if (SUCCEEDED(hr))
+    if (pVMR9->mode ||
+            SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed)))
         hr = VMR9_maybe_init(pVMR9, FALSE);

return hr;