From 4623d376d064a8f9de2df971e1969379a87476a3 Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Sun, 5 Feb 2017 19:58:57 +0100
Subject: [PATCH] Another follow up to d99c914

---
 src/map/chrif.c | 6 +++---
 src/map/chrif.h | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/map/chrif.c b/src/map/chrif.c
index 008ab22256..a94f69e5bd 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -294,7 +294,7 @@ int chrif_save(struct map_session_data *sd, enum e_chrif_save_opt flag) {
 
 	pc_makesavestatus(sd);
 
-	if (flag && sd->state.active) { //Store player data which is quitting
+	if ( (flag&CSAVE_QUITTING) && sd->state.active) { //Store player data which is quitting
 		if (chrif_isconnected()) {
 			chrif_save_scdata(sd);
 			chrif_skillcooldown_save(sd);
@@ -305,7 +305,7 @@ int chrif_save(struct map_session_data *sd, enum e_chrif_save_opt flag) {
 
 	chrif_check(-1); //Character is saved on reconnect.
 
-	chrif_bsdata_save(sd, (flag && !(flag&CSAVE_AUTOTRADE)));
+	chrif_bsdata_save(sd, ((flag&CSAVE_QUITTING) && !(flag&CSAVE_AUTOTRADE)));
 
 	if (&sd->storage && sd->storage.dirty)
 		storage_storagesave(sd);
@@ -320,7 +320,7 @@ int chrif_save(struct map_session_data *sd, enum e_chrif_save_opt flag) {
 	if (&sd->premiumStorage && sd->premiumStorage.dirty)
 		storage_premiumStorage_save(sd);
 
-	if (flag)
+	if (flag&CSAVE_QUITTING)
 		sd->state.storage_flag = 0; //Force close it.
 
 	//Saving of registry values.
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 47e98cf3d9..10e6ecdcd8 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -17,6 +17,7 @@ enum e_chrif_save_opt {
 	CSAVE_AUTOTRADE = 0x04,		/// Character entering autotrade state
 	CSAVE_INVENTORY = 0x08,		/// Inventory data changed
 	CSAVE_CART = 0x10,				/// Cart data changed
+	CSAVE_QUITTING = CSAVE_QUIT|CSAVE_CHANGE_MAPSERV|CSAVE_AUTOTRADE,
 };
 
 struct auth_node {