From 40d6bfbb41f0ef8459843e4abd9da7fe5ebb73bb Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Tue, 30 May 2017 17:14:12 +0800
Subject: [PATCH] bug fix

---
 .../alphafine/search/manager/RecentSearchManager.java        | 5 ++++-
 .../src/com/fr/design/actions/help/alphafine/RemindPane.java | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java
index 9f060def6..8742c09ba 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java
@@ -97,7 +97,10 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear
 
     private void addModelToList(List<AlphaCellModel> list, String name) {
         try {
-            list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
+            AlphaCellModel model = CellModelHelper.getModelFromJson(new JSONObject(name));
+            if (model != null) {
+                list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
+            }
         } catch (JSONException e) {
             FRLogger.getLogger().error(e.getMessage());
         }
diff --git a/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java b/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java
index 32431d745..db984aeca 100644
--- a/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java
+++ b/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java
@@ -46,6 +46,7 @@ public class RemindPane extends JPanel {
         openButton.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
+                manager.setOperateCount(0);
                 dialog.dispose();
                 AlphafineContext.fireAlphaFineContextListener();
 
@@ -77,7 +78,7 @@ public class RemindPane extends JPanel {
         closeButton.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
-                //manager.setOperateCount(0);
+                manager.setOperateCount(0);
                 dialog.dispose();
 
             }