From 9e4e56c4e86447fc19690bfe9071122c60dd2761 Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Thu, 27 Jan 2011 18:06:28 -0500
Subject: [PATCH] Correct problems when renaming stacks.

---
 src/cx/fbn/nevernote/NeverNote.java         | 3 ++-
 src/cx/fbn/nevernote/sql/NotebookTable.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 8ee35d5..4ab6501 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -1441,7 +1441,8 @@ public class NeverNote extends QMainWindow{
 		if (guid.equalsIgnoreCase("STACK")) {
 			conn.getNotebookTable().renameStacks(currentSelection.text(0), edit.getNotebook());
 			for (int j=0; j<listManager.getNotebookIndex().size(); j++) {
-				if (listManager.getNotebookIndex().get(j).getStack().equalsIgnoreCase(currentSelection.text(0)))
+				if (listManager.getNotebookIndex().get(j).getStack() != null && 
+					listManager.getNotebookIndex().get(j).getStack().equalsIgnoreCase(currentSelection.text(0)))
 						listManager.getNotebookIndex().get(j).setStack(edit.getNotebook());
 			}
 			conn.getNotebookTable().renameStacks(currentSelection.text(0), edit.getNotebook());
diff --git a/src/cx/fbn/nevernote/sql/NotebookTable.java b/src/cx/fbn/nevernote/sql/NotebookTable.java
index 5da5f54..3cf3ab0 100644
--- a/src/cx/fbn/nevernote/sql/NotebookTable.java
+++ b/src/cx/fbn/nevernote/sql/NotebookTable.java
@@ -736,7 +736,7 @@ public class NotebookTable {
 			return;
 		}
 		
-		if (!query.prepare("update SystemIcon set stack=:newName where stack=:oldName and type='STACK'")) {
+		if (!query.prepare("update SystemIcon set name=:newName where name=:oldName and type='STACK'")) {
 			logger.log(logger.EXTREME, "Error preparing icon rename in renameStacks.");
 			return;
 		}
-- 
2.11.0