Restore Output if line is finished

inkcpp/output.cpp

@@ -339,13 +339,17 @@ char* basic_stream::get_alloc(string_table& strings, list_table& lists)
 	_size = start;
 
 	// Return processed string
-	end        = clean_string<true, false>(buffer, buffer + c_str_len(buffer));
-	*end       = 0;
-	_last_char = end[-1];
-	if constexpr (RemoveTail) {
-		if (_last_char == ' ') {
-			end[-1] = 0;
+	end  = clean_string<true, false>(buffer, buffer + c_str_len(buffer));
+	*end = 0;
+	if (end != buffer) {
+		_last_char = end[-1];
+		if constexpr (RemoveTail) {
+			if (_last_char == ' ') {
+				end[-1] = 0;
+			}
 		}
+	} else {
+		_last_char = 'e';
 	}
 
 	return buffer;
@@ -365,9 +369,8 @@ size_t basic_stream::find_start() const
 	if (_save != ~0 && start < _save) {
 		// TODO: check if we don't reset save correct
 		// at some point we can modifiy the output even behind save (probally discard?) and push a new
-		// element -> invalid save point inkAssert(false, "Trying to access output stream prior to save
-		// point!");
-		const_cast<basic_stream&>(*this).clear();
+		// element -> invalid save point
+		inkAssert(false, "Trying to access output stream prior to save point!");
 	}
 
 	return start;

inkcpp/runner_impl.cpp

@@ -515,6 +515,9 @@ void runner_impl::advance_line()
 	// can be in save state becaues of choice
 	// Garbage collection TODO: How often do we want to do this?
 	_globals->gc();
+	if (_output.saved()) {
+		_output.restore();
+	}
 }
 
 bool runner_impl::can_continue() const { return _ptr != nullptr; }