From 8720f1f253b55fa5233626dd854671a5925d65de Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 20 Sep 2017 11:25:26 -0400
Subject: inventory remembers slot positions

---
 src/systems/dialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/systems/dialog.cpp')

diff --git a/src/systems/dialog.cpp b/src/systems/dialog.cpp
index f4f479f..3c4b4fc 100644
--- a/src/systems/dialog.cpp
+++ b/src/systems/dialog.cpp
@@ -42,12 +42,12 @@ bool DialogSystem::receive(const MouseClickEvent &mce)
 
 			if (!dialogRun.load()) {
 				// copy entity, windows destroys the original after thread detach
+				dialogRun.store(true);
 				std::thread([e, &pos, &dim, &d, &name] {
 					std::string questAssignedText;
 					int newIndex;
 
 					auto exml = WorldSystem::getXML()->FirstChildElement("Dialog");
-					dialogRun.store(true);
 
 					if (e.has_component<Direction>())
 						d.talking = true;
@@ -100,7 +100,7 @@ bool DialogSystem::receive(const MouseClickEvent &mce)
 										} else {
 											UISystem::dialogBox(name.name, "Finish my quest u nug");
 											UISystem::waitForDialog();
-											return;
+											goto END;
 										}
 									//	oldidx = d.index;
 									//	d.index = qxml->UnsignedAttribute("fail");
@@ -139,7 +139,7 @@ bool DialogSystem::receive(const MouseClickEvent &mce)
 						else if (exml->QueryIntAttribute("nextid", &newIndex) == XML_NO_ERROR)
 							d.index = newIndex;
 					}
-
+END:
 					d.talking = false;
 					dialogRun.store(false);
 				}).detach();
-- 
cgit v1.2.3