DREAMWEB: do not call updatescreen before quitting, fixed crash on dosreturn, cleaned up dosreturn stub

1 files changed, 14 insertions, 8 deletions

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 69f240ae5e..b8c5fedccd 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -162,6 +162,10 @@ void DreamGenContext::openfilefromc() {
 
 void DreamGenContext::openfile() {
 	Common::String name = getFilename(*this);
+	if (name.empty()) { //fixme: this happens if you quit from new game/load screen
+		flags._c = true;
+		return;
+	}
 	debug(1, "opening file: %s", name.c_str());
 	engine->openFile(name);
 	cs.word(kHandle) = 1; //only one handle
@@ -361,17 +365,19 @@ void DreamGenContext::generalerror() {
 
 void DreamGenContext::dosreturn() {
 	_cmp(data.byte(kCommandtype), 250);
-	if (flags.z()) goto alreadydos;
-	data.byte(kCommandtype) = 250;
-	al = 46;
-	commandonly();
-alreadydos:
+	if (!flags.z()) {
+		data.byte(kCommandtype) = 250;
+		al = 46;
+		commandonly();
+	}
+
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
-	if (flags.z()) return;
+	if (flags.z()) 
+		return;
 
-	quickquit2();
-	quickquit();
+	data.word(kMousebutton) = 0;
+	engine->quit();
 }
 
 void DreamGenContext::set16colpalette() {}