From d7c27b35ab40ee93c669a98a190104dd39ea1cb8 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 8 Jan 2015 17:47:20 -0500
Subject: [PATCH] closes #2586

---
 src/favourites.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/favourites.js b/src/favourites.js
index 1af5c881b8..11d6ba6721 100644
--- a/src/favourites.js
+++ b/src/favourites.js
@@ -172,6 +172,10 @@ var async = require('async'),
 				return callback(err);
 			}
 
+			if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) {
+				return callback();
+			}
+
 			var hook,
 				current = voteStatus.upvoted ? 'upvote' : 'downvote';
 
@@ -184,17 +188,17 @@ var async = require('async'),
 				current = 'unvote';
 			}
 
-			plugins.fireHook('action:post.' + hook, {
-				pid: pid,
-				uid: uid,
-				current: current
+			vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, function(err, data) {
+				if (err) {
+					return callback(err);
+				}
+				plugins.fireHook('action:post.' + hook, {
+					pid: pid,
+					uid: uid,
+					current: current
+				});
+				callback(null, data);
 			});
-
-			if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) {
-				return callback();
-			}
-
-			vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, callback);
 		});
 	}