Fixed results not being used when popping dialogs

Fixes #66
ThaumRystra · May 11, 2017 · abcfe57 · abcfe57
1 parent cdae75b
commit abcfe57
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js
@@ -17,19 +17,23 @@ 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);
 	}
 }
 
 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;
 	}
 }