[PATCH v2 1/1] user32: Restore the previous thread DPI awareness context before leaving CalcChildScroll().

[Conor McCarthy]

From: Conor McCarthy

---
 dlls/user32/mdi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 05725a29914..f023eb5e39d 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -1658,7 +1658,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
             {
                 HeapFree( GetProcessHeap(), 0, list );
                 NtUserShowScrollBar( hwnd, SB_BOTH, FALSE );
-                return;
+                goto done;
             }
             if (style & WS_VISIBLE)
             {
@@ -1700,6 +1700,8 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
                         }
    		break;
     }
+
+done:
     SetThreadDpiAwarenessContext( context );
 }