Merge 691fbc2 into a3f5cff

mattermost · Apr 8, 2017 · e056bd0 · e056bd0
2 parents a3f5cff + 691fbc2
commit e056bd0
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/webapp/stores/search_store.jsx b/webapp/stores/search_store.jsx
@@ -5,6 +5,8 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 import EventEmitter from 'events';
 
 import Constants from 'utils/constants.jsx';
+import ChannelStore from 'stores/channel_store.jsx';
+
 var ActionTypes = Constants.ActionTypes;
 
 var CHANGE_EVENT = 'change';
@@ -126,6 +128,13 @@ SearchStore.dispatchToken = AppDispatcher.register((payload) => {
 
     switch (action.type) {
     case ActionTypes.RECEIVED_SEARCH:
+        if (SearchStore.getIsPinnedPosts() === action.is_pinned_posts &&
+            action.is_pinned_posts === true &&
+            SearchStore.getSearchResults().posts &&
+            ChannelStore.getCurrentId() !== Object.values(SearchStore.getSearchResults().posts)[0].channel_id) {
+            // ignore pin posts update after switch to a new channel
+            return;
+        }
         SearchStore.storeSearchResults(action.results, action.is_mention_search, action.is_flagged_posts, action.is_pinned_posts);
         SearchStore.emitSearchChange();
         break;