From abcfe57add25bcc649bea7b77457213bc62b9173 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 11 May 2017 11:08:00 +0200
Subject: [PATCH] Fixed results not being used when popping dialogs

Fixes #66
---
 .../views/paperTemplates/dialogStack/dialogStack.js       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js
index 93177238..e52cb10a 100644
--- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js
+++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js
@@ -17,11 +17,14 @@ pushDialogStack = function({template, data, element, returnElement, callback}){
 	updateHistory();
 };
 
+var currentResult;
+
 popDialogStack = function(result){
 	if (history && history.state && history.state.openDialogs){
+		currentResult = result;
 		history.back();
 	} else {
-		popDialogStackAction();
+		popDialogStackAction(result);
 	}
 }
 
@@ -29,7 +32,8 @@ window.onpopstate = function(event){
 	let state = event.state;
 	let numDialogs = dialogs._array.length;
 	if (_.isFinite(state.openDialogs) && numDialogs > state.openDialogs){
-		popDialogStackAction();
+		popDialogStackAction(currentResult);
+		currentResult = undefined;
 	}
 }