From 1b9defdf8b8226997baaf31158fe34e5f25591d2 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Sat, 28 Nov 2015 23:22:39 -0500
Subject: [PATCH] closes #3892

---
 src/reset.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/reset.js b/src/reset.js
index 55559696bf..ce1b585a01 100644
--- a/src/reset.js
+++ b/src/reset.js
@@ -2,6 +2,7 @@
 
 var winston = require('winston');
 var nconf = require('nconf');
+var async = require('async');
 var db = require('./database');
 
 var Reset = {};
@@ -81,11 +82,29 @@ function resetThemes(callback) {
 }
 
 function resetPlugin(pluginId) {
-	db.sortedSetRemove('plugins:active', pluginId, function(err) {
+	var active = false;
+
+	async.waterfall([
+		async.apply(db.isSortedSetMember, 'plugins:active', pluginId),
+		function(isMember, next) {
+			active = isMember;
+
+			if (isMember) {
+				db.sortedSetRemove('plugins:active', pluginId, next);
+			} else {
+				next();
+			}
+		}
+	], function(err) {
 		if (err) {
 			winston.error('[reset] Could not disable plugin: %s encountered error %s', pluginId, err.message);
 		} else {
-			winston.info('[reset] Plugin `%s` disabled', pluginId);
+			if (active) {
+				winston.info('[reset] Plugin `%s` disabled', pluginId);
+			} else {
+				winston.warn('[reset] Plugin `%s` was not active on this forum', pluginId);
+				winston.info('[reset] No action taken.');
+			}
 		}
 
 		process.exit();