From f599ab1623cf21a89fb3c32b8e473502dce78d2b Mon Sep 17 00:00:00 2001
From: emteere <47253321+emteere@users.noreply.github.com>
Date: Thu, 5 Sep 2019 16:24:29 -0400
Subject: [PATCH] GT-3049 Fixes for return storage commit

---
 .../app/plugin/core/decompile/actions/CommitParamsAction.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/CommitParamsAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/CommitParamsAction.java
index 308f71aa74..9716959d9b 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/CommitParamsAction.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/CommitParamsAction.java
@@ -90,8 +90,9 @@ public class CommitParamsAction extends DockingAction {
 			if (hfunc.getFunction().getSignatureSource() == SourceType.USER_DEFINED) {
 				source = SourceType.USER_DEFINED;
 			}
-			HighFunctionDBUtil.commitParamsToDatabase(hfunc, true, source);
+			
 			HighFunctionDBUtil.commitReturnToDatabase(hfunc, source);
+			HighFunctionDBUtil.commitParamsToDatabase(hfunc, true, source);
 		}
 		catch (DuplicateNameException e) {
 			throw new AssertException("Unexpected exception", e);