From 71b214686228742a676715b8b078fd732cd909f5 Mon Sep 17 00:00:00 2001
From: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Date: Fri, 22 Jul 2022 10:20:46 -0400
Subject: [PATCH] Minor cleanup

---
 .../ActionOpenPageHandler.swift               | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/MVMCore/MVMCore/ActionHandling/ActionOpenPageHandler.swift b/MVMCore/MVMCore/ActionHandling/ActionOpenPageHandler.swift
index e1de127..a3f00e8 100644
--- a/MVMCore/MVMCore/ActionHandling/ActionOpenPageHandler.swift
+++ b/MVMCore/MVMCore/ActionHandling/ActionOpenPageHandler.swift
@@ -49,33 +49,26 @@ open class ActionOpenPageHandler: MVMCoreActionHandlerProtocol {
 }
 
 public extension ClientParameterHandler {
+    
     ///  Iterates through the clientParameters list. Gets values from the individual handlers and attaches the parameters to extraParameters.
     func getClientParameters(with model: ClientParameterModel, requestParameters: [String: Any], showLoadingOverlay: Bool) async throws -> [String: Any]? {
-        
         if showLoadingOverlay {
             MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.startLoading()
         }
-        
-        do {
-            let parameters: [String: Any]? = try await withCheckedThrowingContinuation({ continuation in
-                do {
-                    try getParameters(with: model, requestParameters: requestParameters) { parameters in
-                        MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
-                        continuation.resume(returning: parameters)
-                    }
-                } catch {
-                    continuation.resume(throwing: error)
-                }
-            })
+        defer {
             if showLoadingOverlay {
                 MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
             }
-            return parameters
-        } catch {
-            if showLoadingOverlay {
-                MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
-            }
-            throw error
         }
+        return try await withCheckedThrowingContinuation({ continuation in
+            do {
+                try getParameters(with: model, requestParameters: requestParameters) { parameters in
+                    MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
+                    continuation.resume(returning: parameters)
+                }
+            } catch {
+                continuation.resume(throwing: error)
+            }
+        })
     }
 }