From b9a50fe131c5907a9dfc5739ee2cc7763bb94777 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 30 Dec 2018 01:54:21 +0800
Subject: [PATCH] Fix callSave bug

---
 libs/control.js      | 8 ++++----
 project/functions.js | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libs/control.js b/libs/control.js
index f074205c..5d6ad033 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2061,10 +2061,6 @@ control.prototype.save = function(need) {
 control.prototype.load = function (need) {
     if (core.isReplaying()) return;
 
-    if (core.status.event.id == 'load' && core.events.recoverEvents(core.status.event.interval)) {
-        return;
-    }
-
     var saveIndex = core.saves.saveIndex;
     var page=parseInt((saveIndex-1)/5), offset=saveIndex-5*page;
 
@@ -2080,6 +2076,10 @@ control.prototype.load = function (need) {
         return;
     }
 
+    if (core.status.event.id == 'load' && core.events.recoverEvents(core.status.event.interval)) {
+        return;
+    }
+
     if (!core.checkStatus('load', need))
         return;
     core.ui.drawSLPanel(10*page+offset);
diff --git a/project/functions.js b/project/functions.js
index f4019573..be76d7d9 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -147,6 +147,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	// 如果是读档，则进行检查
 	if (fromLoad) {
 		core.events.recoverEvents(core.getFlag("__events__"));
+		core.removeFlag("__events__");
 	}
 	else {
 		// 每次抵达楼层执行的事件