From a6f978e1c3a27c7045ec3be129d8d6883f021015 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 8 Jan 2013 16:42:07 +0100 Subject: Logic (only update ret if it does not indicate an error yet) Change-Id: I717ff4de7cf406b01383f8f181b81695242a2ca8 --- embedserv/source/inprocserv/inprocembobj.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'embedserv/source/inprocserv/inprocembobj.cxx') diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 27c28adff032..536095fcaf31 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -785,7 +785,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption ) if (!SUCCEEDED(hr)) ret = hr; hr = CoDisconnectObject( (IUnknown*)(IPersistStorage*)this, 0 ); - if (!(SUCCEEDED(hr) && SUCCEEDED(ret))) + if (!SUCCEEDED(hr) && SUCCEEDED(ret)) ret = hr; } } -- cgit